Fix some issues with inspector cache not updating for behaviour conve…

…rsion - Also catch errors on serialization on conversion to prevent complete failure
MerlinVR · Sep 4, 2020 · b400682 · b400682
1 parent 2f13b8d
commit b400682
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Assets/UdonSharp/Editor/Editors/UdonSharpBehaviourEditor.cs b/Assets/UdonSharp/Editor/Editors/UdonSharpBehaviourEditor.cs
@@ -332,7 +332,7 @@ private void OnEnable()
 
             if (target is UdonBehaviour udonBehaviour && UdonSharpEditorUtility.IsUdonSharpBehaviour(udonBehaviour))
             {
-                UdonSharpBehaviour proxyBehaviour = UdonSharpEditorUtility.GetProxyBehaviour(udonBehaviour);
+                UdonSharpBehaviour proxyBehaviour = UdonSharpEditorUtility.GetProxyBehaviour(udonBehaviour, ProxySerializationPolicy.NoSerialization);
 
                 if (proxyBehaviour)
                     proxyBehaviour.hideFlags =

diff --git a/Assets/UdonSharp/Editor/UdonSharpEditorUtility.cs b/Assets/UdonSharp/Editor/UdonSharpEditorUtility.cs
@@ -132,7 +132,7 @@ public static UdonBehaviour[] ConvertToUdonBehavioursWithUndo(UdonSharpBehaviour
             return ConvertToUdonBehavioursInternal(components, true, false);
         }
 
-        static Dictionary<MonoScript, UdonSharpProgramAsset> _programAssetLookup;
+        static internal Dictionary<MonoScript, UdonSharpProgramAsset> _programAssetLookup;
         private static UdonSharpProgramAsset GetUdonSharpProgramAsset(MonoScript programScript)
         {
             if (_programAssetLookup == null)
@@ -628,8 +628,14 @@ internal static UdonBehaviour[] ConvertToUdonBehavioursInternal(UdonSharpBehavio
                     newProxy = (UdonSharpBehaviour)targetObject.gameObject.AddComponent(behaviourType);
 
                 UdonSharpEditorUtility.SetBackingUdonBehaviour(newProxy, udonBehaviour);
-
-                UdonSharpEditorUtility.CopyUdonToProxy(newProxy);
+                try
+                {
+                    UdonSharpEditorUtility.CopyUdonToProxy(newProxy);
+                }
+                catch (System.Exception e)
+                {
+                    Debug.LogError(e);
+                }
 
                 if (shouldUndo)
                     Undo.DestroyObjectImmediate(targetObject);

diff --git a/Assets/UdonSharp/Editor/UdonSharpProgramAsset.cs b/Assets/UdonSharp/Editor/UdonSharpProgramAsset.cs
@@ -222,6 +222,7 @@ public static void CompileAllCsPrograms(bool forceCompile = false, bool editorBu
         internal static void ClearProgramAssetCache()
         {
             _programAssetCache = null;
+            UdonSharpEditorUtility._programAssetLookup = null;
         }
 
         [PublicAPI]