chore: remove merged property which is nonsense

anatawa12 · Apr 20, 2023 · 8846c93 · 8846c93
1 parent 05fbf94
commit 8846c93
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/Editor/MergePhysBoneEditor.cs b/Editor/MergePhysBoneEditor.cs
@@ -26,7 +26,6 @@ private static class Style
             };
         }
 
-        private SerializedProperty _mergedComponentProp;
         private SerializedProperty _makeParent;
         private SerializedProperty _forcesProp;
         private SerializedProperty _pullProp;
@@ -55,7 +54,6 @@ private static class Style
         private void OnEnable()
         {
             var nestCount = PrefabSafeSet.PrefabSafeSetUtil.PrefabNestCount(serializedObject.targetObject);
-            _mergedComponentProp = serializedObject.FindProperty("merged");
             _makeParent = serializedObject.FindProperty("makeParent");
             _forcesProp = serializedObject.FindProperty("forces");
             _pullProp = serializedObject.FindProperty("pull");
@@ -86,10 +84,6 @@ private void OnEnable()
 
         protected override void OnInspectorGUIInner()
         {
-            EditorGUI.BeginDisabledGroup(_mergedComponentProp.objectReferenceValue != null);
-            EditorGUILayout.PropertyField(_mergedComponentProp);
-            EditorGUI.EndDisabledGroup();
-
             EditorGUILayout.PropertyField(_makeParent);
             if (_makeParent.boolValue && ((Component)target).transform.childCount != 0)
                 EditorGUILayout.HelpBox(CL4EE.Tr("MergePhysBone:error:makeParentWithChildren"), MessageType.Error);

diff --git a/Editor/Processors/MergePhysBoneProcessor.cs b/Editor/Processors/MergePhysBoneProcessor.cs
@@ -5,6 +5,7 @@
 using UnityEditor;
 using UnityEngine;
 using VRC.Dynamics;
+using VRC.SDK3.Dynamics.PhysBone.Components;
 using Object = UnityEngine.Object;
 
 namespace Anatawa12.AvatarOptimizer.Processors
@@ -69,7 +70,7 @@ internal static void DoMerge(MergePhysBone merge, OptimizerSession session)
                     $"property differ: {string.Join(", ", differProps)}");
 
             var pb = sourceComponents[0];
-            var merged = merge.merged;
+            var merged = merge.GetComponent<VRCPhysBone>();
 
             // optimization: if All children of the parent is to be merged,
             //    reuse that parent GameObject instead of creating new one.

diff --git a/Runtime/MergePhysBone.cs b/Runtime/MergePhysBone.cs
@@ -13,10 +13,6 @@ namespace Anatawa12.AvatarOptimizer
     [ExecuteAlways]
     internal class MergePhysBone : AvatarTagComponent
     {
-        [FormerlySerializedAs("mergedComponent")]
-        [CL4EELocalized("MergePhysBone:prop:merged")]
-        public VRCPhysBoneBase merged;
-
         [Obsolete("v2 legacy", true)]
         public Transform rootTransform;
 
@@ -81,12 +77,6 @@ public MergePhysBone()
         {
             componentsSet = new PrefabSafeSet.VRCPhysBoneBaseSet(this);
         }
-
-        void OnEnable()
-        {
-            if (merged == null)
-                merged = GetComponent<VRCPhysBoneBase>();
-        }
     }
 
     public enum CollidersSettings