Merge branch 'master' into fix-deprecation-warnings

CHANGELOG-PRERELEASE.md

@@ -19,6 +19,10 @@ The format is based on [Keep a Changelog].
 
 ### Security
 
+## [1.5.0-rc.9] - 2023-09-28
+### Fixed
+- Editor of EditSkinnedMesh components may not work well if the object is inactive [`#518`](https://github.com/anatawa12/AvatarOptimizer/pull/518)
+
 ## [1.5.0-rc.8] - 2023-09-25
 ### Added
 - Warning Dialog for Legacy Modular Avatar [`#509`](https://github.com/anatawa12/AvatarOptimizer/pull/509)
@@ -812,7 +816,8 @@ This release is mistake.
 - Merge Bone
 - Clear Endpoint Position
 
-[Unreleased]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.5.0-rc.8...HEAD
+[Unreleased]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.5.0-rc.9...HEAD
+[1.5.0-rc.9]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.5.0-rc.8...v1.5.0-rc.9
 [1.5.0-rc.8]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.5.0-rc.7...v1.5.0-rc.8
 [1.5.0-rc.7]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.5.0-rc.6...v1.5.0-rc.7
 [1.5.0-rc.6]: https://github.com/anatawa12/AvatarOptimizer/compare/v1.5.0-rc.5...v1.5.0-rc.6

CHANGELOG.md

@@ -43,6 +43,7 @@ The format is based on [Keep a Changelog].
 - MergeBone may make some bone inactive to active if bone being merged is inactive `#454`
 - Avoid problematic material slot in MergeSkinnedMesh [`#508`](https://github.com/anatawa12/AvatarOptimizer/pull/508)
   - This avoids [Unity's bug in 2019][unity-bug-material]. In Unity 2022, this is no longer needed.
+- Editor of EditSkinnedMesh components may not work well if the object is inactive `#518`
 
 [unity-bug]: https://issuetracker.unity3d.com/issues/crash-on-gettargetassemblybyscriptpath-when-a-po-file-in-the-packages-directory-is-not-under-an-assembly-definition
 [unity-bug-material]: https://issuetracker.unity3d.com/issues/material-is-applied-to-two-slots-when-applying-material-to-a-single-slot-while-recording-animation

Editor/EditSkinnedMeshComponentUtil.cs

@@ -5,7 +5,6 @@
 using JetBrains.Annotations;
 using UnityEditor;
 using UnityEngine;
-using UnityEngine.SceneManagement;
 
 namespace Anatawa12.AvatarOptimizer
 {
@@ -14,34 +13,20 @@ internal static class EditSkinnedMeshComponentUtil
     {
         static EditSkinnedMeshComponentUtil()
         {
-            RuntimeUtil.OnAwakeEditSkinnedMesh += OnAwake;
-            RuntimeUtil.OnDestroyEditSkinnedMesh += OnDestroy;
-
-            AssemblyReloadEvents.afterAssemblyReload += AfterAssemblyReload;
-        }
-
-        private static void AfterAssemblyReload()
-        {
-            foreach (var component in Enumerable.Range(0, SceneManager.sceneCount)
-                         .Select(SceneManager.GetSceneAt)
-                         .SelectMany(x => x.GetRootGameObjects())
-                         .SelectMany(x => x.GetComponentsInChildren<EditSkinnedMeshComponent>(true)))
-                OnAwake(component);
-        }
-
-        // might be called by Processor to make sure the component is registered
-        internal static void OnAwake(EditSkinnedMeshComponent component)
-        {
-            EditorShared.AddComponent(component);
+            EditorApplication.hierarchyChanged += ResetSharedSorter;
         }
 
-        private static void OnDestroy(EditSkinnedMeshComponent component)
+        private static SkinnedMeshEditorSorter CreateSharedSorterWithScene()
         {
-            EditorShared.RemoveComponent(component);
+            var sorter = new SkinnedMeshEditorSorter();
+            foreach (var component in Resources.FindObjectsOfTypeAll<EditSkinnedMeshComponent>()
+                         .Where(x => !EditorUtility.IsPersistent(x))
+                         .Where(x => x.gameObject.scene.IsValid()))
+                sorter.AddComponent(component);
+            return sorter;
         }
 
-        public static bool IsModifiedByEditComponent(SkinnedMeshRenderer renderer) =>
-            EditorShared.IsModifiedByEditComponent(renderer);
+        private static void ResetSharedSorter() => _editorShared = null;
 
         public static (string name, float weight)[] GetBlendShapes(SkinnedMeshRenderer renderer) => EditorShared.GetBlendShapes(renderer);
 
@@ -55,7 +40,11 @@ public static (string name, float weight)[] GetBlendShapes(SkinnedMeshRenderer r
         public static Material[] GetMaterials(SkinnedMeshRenderer renderer, EditSkinnedMeshComponent before = null,
             bool fast = true) => EditorShared.GetMaterials(renderer, before, fast);
 
-        private static readonly SkinnedMeshEditorSorter EditorShared = new SkinnedMeshEditorSorter();
+        [CanBeNull] private static SkinnedMeshEditorSorter _editorShared;
+
+        [NotNull]
+        private static SkinnedMeshEditorSorter EditorShared =>
+            _editorShared ?? (_editorShared = CreateSharedSorterWithScene());
     }
 
     internal class SkinnedMeshEditorSorter
@@ -69,12 +58,6 @@ public void AddComponent(EditSkinnedMeshComponent component)
             processors.AddProcessor(processor);
         }
 
-        public void RemoveComponent(EditSkinnedMeshComponent component)
-        {
-            var target = component.GetComponent<SkinnedMeshRenderer>();
-            GetProcessors(target)?.RemoveProcessorOf(component);
-        }
-
         public bool IsModifiedByEditComponent(SkinnedMeshRenderer renderer) =>
             ProcessorsByRenderer.ContainsKey(renderer);
 
@@ -151,13 +134,6 @@ public void AddProcessor(IEditSkinnedMeshProcessor processor)
                     PurgeCache();
             }
 
-            public void RemoveProcessorOf(EditSkinnedMeshComponent component)
-            {
-                var removed = _processors.RemoveWhere(x => x.Component == component);
-                if (removed == 0) return;
-                PurgeCache(removing: true);
-            }
-
             internal List<IEditSkinnedMeshProcessor> GetSorted()
             {
                 if (_sorted != null) return _sorted;

Runtime/EditSkinnedMeshComponent.cs

@@ -3,11 +3,7 @@
 namespace Anatawa12.AvatarOptimizer
 {
     [RequireComponent(typeof(SkinnedMeshRenderer))]
-    [ExecuteAlways]
     internal abstract class EditSkinnedMeshComponent : AvatarTagComponent
     {
-        private void Awake() => RuntimeUtil.OnAwakeEditSkinnedMesh?.Invoke(this);
-
-        private void OnDestroy() => RuntimeUtil.OnDestroyEditSkinnedMesh?.Invoke(this);
     }
 }

Runtime/RuntimeUtil.cs

@@ -33,8 +33,5 @@ public static string RelativePath(GameObject root, GameObject child)
 #else
         public static bool isPlaying => true;
 #endif
-
-        public static Action<EditSkinnedMeshComponent> OnAwakeEditSkinnedMesh;
-        public static Action<EditSkinnedMeshComponent> OnDestroyEditSkinnedMesh;
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.anatawa12.avatar-optimizer",
-  "version": "1.5.0-rc.8",
+  "version": "1.5.0-rc.9",
   "unity": "2019.4",
   "description": "Set of Anatawa12's Small Avatar Optimization Utilities",
   "displayName": "Anatawa12's AvatarOptimizer",