Skip to content

Backport Uncomment adding backslashes to HYBRID_V1_CUSTOM_ADDITIONAL_MATERIAL_VARS generation #1596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 13, 2020
Merged

Backport Uncomment adding backslashes to HYBRID_V1_CUSTOM_ADDITIONAL_MATERIAL_VARS generation #1596

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions com.unity.shadergraph/Editor/Generation/Processors/PropertyCollector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,16 @@ public string GetDotsInstancingPropertiesDeclaration(GenerationMode mode)
builder.Append("#define HYBRID_V1_CUSTOM_ADDITIONAL_MATERIAL_VARS\t");

int count = 0;
int instancedCount = dotsInstancingProperties.Count();
foreach (var prop in dotsInstancingProperties)
{
string varName = $"{prop.referenceName}_Array";
string sType = prop.concreteShaderValueType.ToShaderString(prop.concretePrecision);
builder.Append("UNITY_DEFINE_INSTANCED_PROP({0}, {1})", sType, varName);
// if (count < instancedCount - 1)
// builder.Append("\\");
// Combine the UNITY_DEFINE_INSTANCED_PROP lines with \ so the generated
// macro expands into multiple definitions if there are more than one.
if (count < instancedCount - 1)
builder.Append("\\");
builder.AppendLine("");
count++;
}
Expand Down