AlwaysUpdate flag was not being copied during the serialization process

schjames · Apr 13, 2021 · deaca5c · deaca5c
1 parent 4db4fa6
commit deaca5c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/UMAProject/Assets/UMA/Core/Editor/Scripts/UMAMaterialPropertyBlockDrawer.cs b/UMAProject/Assets/UMA/Core/Editor/Scripts/UMAMaterialPropertyBlockDrawer.cs
@@ -36,6 +36,7 @@ public static bool OnGUI(UMAMaterialPropertyBlock umpb)
             GUILayout.Label("Shader Properties",GUILayout.ExpandWidth(true));
             GUILayout.Label("Always Update",GUILayout.ExpandWidth(false));
             umpb.alwaysUpdate = GUILayout.Toggle(umpb.alwaysUpdate, "",GUILayout.ExpandWidth(false));
+
             GUILayout.EndHorizontal();
             GUILayout.BeginHorizontal();
 

diff --git a/UMAProject/Assets/UMA/Core/Scripts/UMAPackedRecipeBase.cs b/UMAProject/Assets/UMA/Core/Scripts/UMAPackedRecipeBase.cs
@@ -353,6 +353,7 @@ public class PackedOverlayColorDataV3
 			// Put everything in one array
 			public short[] colors;
 			public string[] ShaderParms;
+			public bool alwaysUpdate;
 
 			public PackedOverlayColorDataV3()
 			{
@@ -383,6 +384,10 @@ public PackedOverlayColorDataV3(OverlayColorData colorData)
 						colors[colorIndex++] = (short)Mathf.FloorToInt(additiveMaskColor.a * 255f);
 					}
 				}
+				if (colorData.HasPropertyBlock)
+                {
+					alwaysUpdate = colorData.PropertyBlock.alwaysUpdate;
+                }
 				if (colorData.HasProperties)
                 {
 					ShaderParms = new string[colorData.PropertyBlock.shaderProperties.Count];
@@ -421,6 +426,7 @@ public void SetOverlayColorData(OverlayColorData overlayColorData)
 					if (ShaderParms.Length > 0)
                     {
 						overlayColorData.PropertyBlock = new UMAMaterialPropertyBlock();
+						overlayColorData.PropertyBlock.alwaysUpdate = alwaysUpdate; 
 						for(int i=0;i<ShaderParms.Length;i++)
                         {
 							overlayColorData.PropertyBlock.shaderProperties.Add(UMAProperty.FromString(ShaderParms[i]));

diff --git a/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/OverlayColorData.cs b/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/OverlayColorData.cs
@@ -99,6 +99,7 @@ public OverlayColorData Duplicate()
 			if (PropertyBlock != null)
             {
 				res.PropertyBlock = new UMAMaterialPropertyBlock();
+				res.PropertyBlock.alwaysUpdate = PropertyBlock.alwaysUpdate;
 				res.PropertyBlock.shaderProperties = new List<UMAProperty>(PropertyBlock.shaderProperties.Count);
 				for(int i=0;i<PropertyBlock.shaderProperties.Count;i++)
                 {
@@ -142,6 +143,13 @@ public bool HasColors
             }
         }
 
+		public bool HasPropertyBlock
+        {
+			get
+            {
+				return PropertyBlock != null;
+            }
+        }
 		public bool HasProperties
         {
 			get
@@ -357,6 +365,7 @@ public void AssignFrom(OverlayColorData src)
 			PropertyBlock = new UMAMaterialPropertyBlock();
 			if (src.PropertyBlock != null)
 			{
+				PropertyBlock.alwaysUpdate = src.PropertyBlock.alwaysUpdate;
 				PropertyBlock.shaderProperties = new List<UMAProperty>(src.PropertyBlock.shaderProperties.Count);
 				for (int i = 0; i < src.PropertyBlock.shaderProperties.Count; i++)
 				{

diff --git a/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/UMAMaterialPropertyBlock.cs b/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/UMAMaterialPropertyBlock.cs
@@ -521,7 +521,7 @@ public UMAProperty property
     }
 
     [Serializable]
-    public class UMAMaterialPropertyBlock : ISerializationCallbackReceiver 
+    public class UMAMaterialPropertyBlock : ScriptableObject, ISerializationCallbackReceiver 
     {
         // If this is checked, the color will always update the 
         public bool alwaysUpdate;