[Port] [6000.0] [ShaderGraph] Fix swizzle mask regression plus some other minor issues

svc-reach-platform-support · Evergreen · commit b29602fa09d2 · 2026-02-03T06:08:58.000Z
diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs
@@ -1464,7 +1464,7 @@ void KeywordAddCallbacks()
                     else if (int.TryParse(displayName, out int intVal) || float.TryParse(displayName, out float floatVal))
                         Debug.LogWarning("Invalid display name. Display names cannot be valid integer or floating point numbers.");
                     else
-                        keyword.entries[index] = new KeywordEntry(GetFirstUnusedKeywordID(), displayName, referenceName);
+                        keyword.entries[index] = new KeywordEntry(entry.id, displayName, referenceName);
 
                     this._postChangeValueCallback(true);
                 }
diff --git a/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss b/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss
@@ -14,7 +14,7 @@ ChannelEnumControlView > Label {
     max-width: 100px;
     width: 50px;
     margin-left: 8px;
-    margin-right: 8px;
+    margin-right: 12px;
     -unity-text-align : middle-left;
     flex-grow: 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -1464,7 +1464,7 @@ void KeywordAddCallbacks()`
`1464`	`1464`	`else if (int.TryParse(displayName, out int intVal) \|\| float.TryParse(displayName, out float floatVal))`
`1465`	`1465`	`Debug.LogWarning("Invalid display name. Display names cannot be valid integer or floating point numbers.");`
`1466`	`1466`	`else`
`1467`		`- keyword.entries[index] = new KeywordEntry(GetFirstUnusedKeywordID(), displayName, referenceName);`
	`1467`	`+ keyword.entries[index] = new KeywordEntry(entry.id, displayName, referenceName);`
`1468`	`1468`
`1469`	`1469`	`this._postChangeValueCallback(true);`
`1470`	`1470`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ ChannelEnumControlView > Label {`
`14`	`14`	`max-width: 100px;`
`15`	`15`	`width: 50px;`
`16`	`16`	`margin-left: 8px;`
`17`		`- margin-right: 8px;`
	`17`	`+ margin-right: 12px;`
`18`	`18`	`-unity-text-align : middle-left;`
`19`	`19`	`flex-grow: 1;`
`20`	`20`	`}`