Add checking for if proxies are in a valid state to copy back

- Add check for if proxies are in a valid state to copy back to UdonBehaviours, this prevents potential cases where UdonBehaviour data could be cleared when using custom inspectors
MerlinVR · Sep 23, 2020 · ae1ab6d · ae1ab6d
1 parent 686b7bc
commit ae1ab6d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/Assets/UdonSharp/Editor/Editors/UdonSharpBehaviourEditor.cs b/Assets/UdonSharp/Editor/Editors/UdonSharpBehaviourEditor.cs
@@ -378,10 +378,13 @@ void OnUndoRedo()
 
                 if (customEditorType != null) // Only do the undo copying on things with a custom inspector
                 {
-                    UdonSharpEditorUtility.CopyProxyToUdon(inspectorTarget, ProxySerializationPolicy.All);
-
-                    if (PrefabUtility.IsPartOfPrefabInstance(behaviour))
-                        PrefabUtility.RecordPrefabInstancePropertyModifications(behaviour);
+                    if ((bool)typeof(UdonSharpBehaviour).GetField("_isValidForAutoCopy", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(inspectorTarget))
+                    {
+                        UdonSharpEditorUtility.CopyProxyToUdon(inspectorTarget, ProxySerializationPolicy.All);
+
+                        if (PrefabUtility.IsPartOfPrefabInstance(behaviour))
+                            PrefabUtility.RecordPrefabInstancePropertyModifications(behaviour);
+                    }
                 }
             }
         }
@@ -406,6 +409,8 @@ void CleanupProxy()
                 }
             }
         }
+
+        static FieldInfo _autoCopyValidField = null;
 
         public override void OnInspectorGUI()
         {
@@ -445,6 +450,11 @@ public override void OnInspectorGUI()
                 UdonSharpBehaviour inspectorTarget = UdonSharpEditorUtility.GetProxyBehaviour(behaviour, ProxySerializationPolicy.All);
                 inspectorTarget.enabled = false;
 
+                if (_autoCopyValidField == null)
+                    _autoCopyValidField = typeof(UdonSharpBehaviour).GetField("_isValidForAutoCopy", BindingFlags.NonPublic | BindingFlags.Instance);
+
+                _autoCopyValidField.SetValue(inspectorTarget, true);
+
                 Editor.CreateCachedEditorWithContext(inspectorTarget, this, customEditorType, ref baseEditor);
                 currentProxyBehaviour = inspectorTarget;
 

diff --git a/Assets/UdonSharp/Scripts/UdonSharpBehaviour.cs b/Assets/UdonSharp/Scripts/UdonSharpBehaviour.cs
@@ -145,6 +145,9 @@ void ISerializationCallbackReceiver.OnAfterDeserialize()
 
         [OdinSerialize]
         private IUdonBehaviour _backingUdonBehaviour;
+
+        [SerializeField]
+        private bool _isValidForAutoCopy = false;
 #endif
     }
 }