Merge pull request #470 from umasteeringgroup/MeshModifiers

Attempted Fix of random clearing of global library on domain reload

Author: Jaimi

UMAProject/Assets/UMA/Core/Extensions/DynamicCharacterSystem/Scripts/DynamicCharacterAvatar.cs

@@ -509,11 +509,23 @@ public void Awake()
 #if UNITY_EDITOR
         [UnityEditor.Callbacks.DidReloadScripts]
         private static void OnScriptsReloaded()
+        {
+            if (EditorApplication.isCompiling || EditorApplication.isUpdating)
+            {
+                // Try again after compiling and updating finished.
+                EditorApplication.delayCall += OnScriptsReloaded;
+                return;
+            }
+
+            EditorApplication.delayCall += RebuildAllEditTimeAvatars;
+        }
+
+        private static void RebuildAllEditTimeAvatars()
         {
             if (!EditorApplication.isPlayingOrWillChangePlaymode)
             {
                 DynamicCharacterAvatar[] dcas = GameObject.FindObjectsOfType<DynamicCharacterAvatar>();
-                for(int i=0; i<dcas.Length ; i++)
+                for (int i = 0; i < dcas.Length; i++)
                 {
                     DynamicCharacterAvatar dca = dcas[i];
                     if (dca.editorTimeGeneration)

UMAProject/Assets/UMA/Core/Scripts/UMAAssetIndexer.cs

@@ -181,6 +181,13 @@ public static UMAAssetIndexer Instance
             {
                 if (theIndexer == null)
                 {
+#if UNITY_EDITOR
+                    if (EditorApplication.isCompiling)
+                    {
+                        Debug.Log("Warning: Attempted to get instance while compiling.");
+                        return null;
+                    }
+#endif
                     //var st = StartTimer();
                     theIndexer = Resources.Load("AssetIndexer") as UMAAssetIndexer;
                     if (theIndexer == null)
@@ -1873,7 +1880,7 @@ public void UnloadAll(bool forceResourceUnload)
 				}
 		}
 #endif
-        #endregion
+#endregion
 
         #region Add Remove Assets
 
@@ -2331,7 +2338,7 @@ public void DeleteAsset(System.Type type, string Name)
         }
 
 #endif
-        #endregion
+#endregion
 
         #region Maintenance
 
@@ -2355,6 +2362,15 @@ public void ClearAddressableFlags()
         public void UpdateSerializedDictionaryItems()
         {
             DebugSerialization("Updating serialized Dictionary Items");
+            if (SerializedItems == null)
+            {
+                DebugSerialization("Serialized Items is null");
+                return;
+            }
+            if (SerializedItems.Count == 0)
+            {
+                DebugSerialization("Serialized Items is empty!!!");
+            }
             // Rebuuild all the lookup tables
             // Lookup by guid
             GuidTypes = new Dictionary<string, AssetItem>();
@@ -2951,6 +2967,7 @@ public void RebuildIndex()
 #region Serialization
         void ISerializationCallbackReceiver.OnBeforeSerialize()
         {
+            DebugSerialization("Before Serialize called");
             UpdateSerializedList();
 
             // load typeFolders so it can be serialized.
@@ -2962,6 +2979,7 @@ void ISerializationCallbackReceiver.OnBeforeSerialize()
                 tpf.Folders =  kpv.Value.ToArray();
                 typeFolders.Add(tpf);
             }
+            DebugSerialization("Before Serialize complete");
         }
 
     void ISerializationCallbackReceiver.OnAfterDeserialize()
@@ -3065,7 +3083,13 @@ void ISerializationCallbackReceiver.OnAfterDeserialize()
                     TypeLookup = new Dictionary<Type, Dictionary<string, AssetItem>>();
                 }
             }
+
+            // should it call UpdateSerializeDictionaryItems()???
+            // NO IT SHOULD NOT
+            // THIS IS DONE WHERE THE SINGLETON IS CREATED ABOVE
+
             StopTimer(st, "After Serialize");
+            DebugSerialization("After Deserialize complete");
         }
 
 #if UNITY_EDITOR

UMAProject/Assets/UMA/Core/Scripts/UMASettings.cs

@@ -4,7 +4,6 @@
 using UnityEngine;
 using UnityEditor;
 using UMA;
-using Codice.CM.WorkspaceServer.DataStore.Merge;
 using System.Threading;
 using System.Diagnostics;