Make child behaviour act consistently on ConvertToUdonBehaviours

- `ConvertToUdonBehavioursWithUndo` was converting children behaviours while `ConvertToUdonBehaviours` was not. Both methods now have an optional parameter to choose whether to convert children and do not by default. Reported by Rael
MerlinVR · Jan 19, 2021 · 054d5e9 · 054d5e9
1 parent 0442495
commit 054d5e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/Assets/UdonSharp/Editor/Editors/UdonSharpGUI.cs b/Assets/UdonSharp/Editor/Editors/UdonSharpGUI.cs
@@ -1502,7 +1502,7 @@ public static bool DrawConvertToUdonBehaviourButton(UnityEngine.Object target)
                 EditorGUI.BeginDisabledGroup(EditorApplication.isPlaying);
                 if (GUILayout.Button("Convert to UdonBehaviour", GUILayout.Height(25)))
                 {
-                    UdonSharpEditorUtility.ConvertToUdonBehavioursInternal(new[] { behaviour }, true, true);
+                    UdonSharpEditorUtility.ConvertToUdonBehavioursInternal(new[] { behaviour }, true, true, true);
                     EditorGUI.EndDisabledGroup();
 
                     return true;
@@ -1547,7 +1547,7 @@ public static bool DrawConvertToUdonBehaviourButton(UnityEngine.Object[] targets
                 EditorGUI.BeginDisabledGroup(EditorApplication.isPlaying);
                 if (GUILayout.Button("Convert to UdonBehaviour", GUILayout.Height(25)))
                 {
-                    UdonSharpEditorUtility.ConvertToUdonBehavioursInternal(Array.ConvertAll(targets, e => e as UdonSharpBehaviour).Where(e => e != null && !UdonSharpEditorUtility.IsProxyBehaviour(e)).ToArray(), true, true);
+                    UdonSharpEditorUtility.ConvertToUdonBehavioursInternal(Array.ConvertAll(targets, e => e as UdonSharpBehaviour).Where(e => e != null && !UdonSharpEditorUtility.IsProxyBehaviour(e)).ToArray(), true, true, true);
                     EditorGUI.EndDisabledGroup();
 
                     return true;

diff --git a/Assets/UdonSharp/Editor/Serialization/ProxySerializationPolicy.cs b/Assets/UdonSharp/Editor/Serialization/ProxySerializationPolicy.cs
@@ -16,6 +16,7 @@ public enum ChildProxyCreateMode
         public int MaxSerializationDepth { get; private set; } = int.MaxValue;
 
         internal static readonly ProxySerializationPolicy AllWithCreateUndo = new ProxySerializationPolicy() { ChildProxyMode = ChildProxyCreateMode.CreateWithUndo };
+        internal static readonly ProxySerializationPolicy AllWithCreate = new ProxySerializationPolicy() { ChildProxyMode = ChildProxyCreateMode.Create };
 
         [PublicAPI]
         public static readonly ProxySerializationPolicy Default = new ProxySerializationPolicy() { ChildProxyMode = ChildProxyCreateMode.Null, MaxSerializationDepth = 1 };

diff --git a/Assets/UdonSharp/Editor/UdonSharpEditorUtility.cs b/Assets/UdonSharp/Editor/UdonSharpEditorUtility.cs
@@ -136,9 +136,9 @@ public static void DeleteProgramAsset(UdonSharpProgramAsset programAsset)
         /// <param name="components"></param>
         /// <returns></returns>
         [PublicAPI]
-        public static UdonBehaviour[] ConvertToUdonBehaviours(UdonSharpBehaviour[] components)
+        public static UdonBehaviour[] ConvertToUdonBehaviours(UdonSharpBehaviour[] components, bool convertChildren = false)
         {
-            return ConvertToUdonBehavioursInternal(components, false, false);
+            return ConvertToUdonBehavioursInternal(components, false, false, convertChildren);
         }
 
         /// <summary>
@@ -148,9 +148,9 @@ public static UdonBehaviour[] ConvertToUdonBehaviours(UdonSharpBehaviour[] compo
         /// <param name="components"></param>
         /// <returns></returns>
         [PublicAPI]
-        public static UdonBehaviour[] ConvertToUdonBehavioursWithUndo(UdonSharpBehaviour[] components)
+        public static UdonBehaviour[] ConvertToUdonBehavioursWithUndo(UdonSharpBehaviour[] components, bool convertChildren = false)
         {
-            return ConvertToUdonBehavioursInternal(components, true, false);
+            return ConvertToUdonBehavioursInternal(components, true, false, convertChildren);
         }
 
         static internal Dictionary<MonoScript, UdonSharpProgramAsset> _programAssetLookup;
@@ -587,12 +587,10 @@ internal static void CollectUdonSharpBehaviourReferencesInternal(object rootObje
             }
         }
 
-        internal static UdonBehaviour[] ConvertToUdonBehavioursInternal(UdonSharpBehaviour[] components, bool shouldUndo, bool showPrompts)
+        internal static UdonBehaviour[] ConvertToUdonBehavioursInternal(UdonSharpBehaviour[] components, bool shouldUndo, bool showPrompts, bool convertChildren)
         {
             components = components.Distinct().ToArray();
 
-            bool convertChildren = true;
-
             if (showPrompts)
             {
                 HashSet<UdonSharpBehaviour> allReferencedBehaviours = new HashSet<UdonSharpBehaviour>();
@@ -710,7 +708,7 @@ internal static UdonBehaviour[] ConvertToUdonBehavioursInternal(UdonSharpBehavio
                 try
                 {
                     if (convertChildren)
-                        UdonSharpEditorUtility.CopyProxyToUdon(targetObject, shouldUndo ? ProxySerializationPolicy.AllWithCreateUndo : ProxySerializationPolicy.All);
+                        UdonSharpEditorUtility.CopyProxyToUdon(targetObject, shouldUndo ? ProxySerializationPolicy.AllWithCreateUndo : ProxySerializationPolicy.AllWithCreate);
                     else
                         UdonSharpEditorUtility.CopyProxyToUdon(targetObject, ProxySerializationPolicy.RootOnly);
                 }