[Port] [6000.2] Fix for UUM-119990

svc-reach-platform-support · Evergreen · commit b0927ef6d8e2 · 2025-11-28T11:27:58.000Z
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomButton.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomButton.cs
@@ -96,7 +96,10 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)
         {
             _material ??= new(baseMaterial);
 
-            _material.SetFloat(StatePropertyId, (int)currentSelectionState);
+            _material.CopyPropertiesFromMaterial(baseMaterial);
+
+            if (_material.HasFloat(StatePropertyId))
+                _material.SetFloat(StatePropertyId, (int)currentSelectionState);
 
             return _material;
         }
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomSlider.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomSlider.cs
@@ -138,8 +138,13 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)
         {
             _material ??= new(baseMaterial);
 
-            _material.SetFloat(StatePropertyId, (int)currentSelectionState);
-            _material.SetVector(SliderValuePropertyId, Vector);
+            _material.CopyPropertiesFromMaterial(baseMaterial);
+
+            if (_material.HasFloat(StatePropertyId))
+                _material.SetFloat(StatePropertyId, (int)currentSelectionState);
+
+            if (_material.HasVector(SliderValuePropertyId))
+                _material.SetVector(SliderValuePropertyId, Vector);
 
             return _material;
         }
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs
@@ -123,10 +123,14 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)
         {
             _material ??= new(baseMaterial);
 
-            _material.SetFloat(StatePropertyId, (int)currentSelectionState);
+            _material.CopyPropertiesFromMaterial(baseMaterial);
+
+            if (_material.HasFloat(StatePropertyId))
+                _material.SetFloat(StatePropertyId, (int)currentSelectionState);
 
             if (_material.HasFloat(IsOnPropertyId))
                 _material.SetFloat(IsOnPropertyId, isOn ? 1 : 0);
+
             return _material;
         }
 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/Meter.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/Meter.cs
@@ -99,6 +99,8 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)
         {
             _material ??= new(baseMaterial);
 
+            _material.CopyPropertiesFromMaterial(baseMaterial);
+
             if (_material.HasFloat(MeterValuePropertyId))
                 _material.SetFloat(MeterValuePropertyId, Value);
 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RangeBar.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RangeBar.cs
@@ -128,6 +128,8 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)
         {
             _material ??= new(baseMaterial);
 
+            _material.CopyPropertiesFromMaterial(baseMaterial);
+
             if (_material.HasVector(RangeBarValuePropertyId))
                 _material.SetVector(RangeBarValuePropertyId, Vector);
 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RectTransformSize.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RectTransformSize.cs
@@ -115,6 +115,8 @@ public Material GetModifiedMaterial(Material baseMaterial)
         {
             _material ??= new(baseMaterial);
 
+            _material.CopyPropertiesFromMaterial(baseMaterial);
+
             if (_material.HasVector(PropertyId))
                 _material.SetVector(PropertyId, RectTransformInfo);
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,10 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)`
`96`	`96`	`{`
`97`	`97`	`_material ??= new(baseMaterial);`
`98`	`98`
`99`		`- _material.SetFloat(StatePropertyId, (int)currentSelectionState);`
	`99`	`+ _material.CopyPropertiesFromMaterial(baseMaterial);`
	`100`	`+`
	`101`	`+ if (_material.HasFloat(StatePropertyId))`
	`102`	`+ _material.SetFloat(StatePropertyId, (int)currentSelectionState);`
`100`	`103`
`101`	`104`	`return _material;`
`102`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,13 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)`
`138`	`138`	`{`
`139`	`139`	`_material ??= new(baseMaterial);`
`140`	`140`
`141`		`- _material.SetFloat(StatePropertyId, (int)currentSelectionState);`
`142`		`- _material.SetVector(SliderValuePropertyId, Vector);`
	`141`	`+ _material.CopyPropertiesFromMaterial(baseMaterial);`
	`142`	`+`
	`143`	`+ if (_material.HasFloat(StatePropertyId))`
	`144`	`+ _material.SetFloat(StatePropertyId, (int)currentSelectionState);`
	`145`	`+`
	`146`	`+ if (_material.HasVector(SliderValuePropertyId))`
	`147`	`+ _material.SetVector(SliderValuePropertyId, Vector);`
`143`	`148`
`144`	`149`	`return _material;`
`145`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,10 +123,14 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)`
`123`	`123`	`{`
`124`	`124`	`_material ??= new(baseMaterial);`
`125`	`125`
`126`		`- _material.SetFloat(StatePropertyId, (int)currentSelectionState);`
	`126`	`+ _material.CopyPropertiesFromMaterial(baseMaterial);`
	`127`	`+`
	`128`	`+ if (_material.HasFloat(StatePropertyId))`
	`129`	`+ _material.SetFloat(StatePropertyId, (int)currentSelectionState);`
`127`	`130`
`128`	`131`	`if (_material.HasFloat(IsOnPropertyId))`
`129`	`132`	`_material.SetFloat(IsOnPropertyId, isOn ? 1 : 0);`
	`133`	`+`
`130`	`134`	`return _material;`
`131`	`135`	`}`
`132`	`136`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,8 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)`
`99`	`99`	`{`
`100`	`100`	`_material ??= new(baseMaterial);`
`101`	`101`
	`102`	`+ _material.CopyPropertiesFromMaterial(baseMaterial);`
	`103`	`+`
`102`	`104`	`if (_material.HasFloat(MeterValuePropertyId))`
`103`	`105`	`_material.SetFloat(MeterValuePropertyId, Value);`
`104`	`106`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,8 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)`
`128`	`128`	`{`
`129`	`129`	`_material ??= new(baseMaterial);`
`130`	`130`
	`131`	`+ _material.CopyPropertiesFromMaterial(baseMaterial);`
	`132`	`+`
`131`	`133`	`if (_material.HasVector(RangeBarValuePropertyId))`
`132`	`134`	`_material.SetVector(RangeBarValuePropertyId, Vector);`
`133`	`135`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,8 @@ public Material GetModifiedMaterial(Material baseMaterial)`
`115`	`115`	`{`
`116`	`116`	`_material ??= new(baseMaterial);`
`117`	`117`
	`118`	`+ _material.CopyPropertiesFromMaterial(baseMaterial);`
	`119`	`+`
`118`	`120`	`if (_material.HasVector(PropertyId))`
`119`	`121`	`_material.SetVector(PropertyId, RectTransformInfo);`
`120`	`122`