Not working with VRCFury

CHANGELOG-PRERELEASE.md

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog].
 ### Fixed
 - Can't remove SkinnedMeshRenderer error `#133`
   - This error should do nothing bad but it confuses everyone
+- Bad behaviour with VRCFury on build `#134`
 
 ### Security
 

CHANGELOG.md

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog].
 ### Fixed
 - Can't remove SkinnedMeshRenderer error `#133`
   - This error should do nothing bad but it confuses everyone
+- Bad behaviour with VRCFury on build `#134`
 
 ### Security
 

Editor/OptimizerProcessor.cs

@@ -32,16 +32,18 @@ public bool OnPreprocessAvatar(GameObject avatarGameObject)
         private static void ProcessObject(OptimizerSession session)
         {
             if (_processing) return;
-            try
-            {
-                AssetDatabase.StartAssetEditing();
-                _processing = true;
-                DoProcessObject(session);
-            }
-            finally
+            using (Utils.StartEditingScope(true))
             {
-                _processing = false;
-                AssetDatabase.SaveAssets();
+                try
+                {
+                    _processing = true;
+                    DoProcessObject(session);
+                }
+                finally
+                {
+                    _processing = false;
+                    session.MarkDirtyAll();
+                }
             }
         }
 
@@ -80,22 +82,23 @@ public void OnPostprocessAvatar()
         public static void ProcessObject(OptimizerSession session)
         {
             if (_processing) return;
-            try
-            {
-                AssetDatabase.StartAssetEditing();
-                _processing = true;
-                DoProcessObject(session);
-            }
-            finally
+            using (Utils.StartEditingScope(true))
             {
-                _processing = false;
-                AssetDatabase.StopAssetEditing();
-                foreach (var component in session.GetComponents<AvatarTagComponent>())
-                    UnityEngine.Object.DestroyImmediate(component);
-                foreach (var activator in session.GetComponents<AvatarActivator>())
-                    UnityEngine.Object.DestroyImmediate(activator);
+                try
+                {
+                    _processing = true;
+                    DoProcessObject(session);
+                }
+                finally
+                {
+                    _processing = false;
+                    foreach (var component in session.GetComponents<AvatarTagComponent>())
+                        UnityEngine.Object.DestroyImmediate(component);
+                    foreach (var activator in session.GetComponents<AvatarActivator>())
+                        UnityEngine.Object.DestroyImmediate(activator);
 
-                AssetDatabase.SaveAssets();
+                    session.MarkDirtyAll();
+                }
             }
         }
 

Editor/Utils.cs

@@ -328,6 +328,33 @@ public static NativeArray<T> SliceNativeArray<T>(NativeArray<T> source, int leng
             source.AsReadOnlySpan().Slice(0, length).CopyTo(res.AsSpan());
             return res;
         }
+
+        public static AssetEditingScope StartEditingScope(bool saveAssets) => AssetEditingScope.Start(saveAssets);
+
+        internal readonly struct AssetEditingScope : IDisposable
+        {
+            // 0: default: skip stop
+            // 1: stop asset editing
+            // 2: stop editing & save assets
+            private readonly int _flags;
+
+            private AssetEditingScope(int flags)
+            {
+                _flags = flags;
+            }
+
+            public static AssetEditingScope Start(bool saveAssets)
+            {
+                AssetDatabase.StartAssetEditing();
+                return new AssetEditingScope(1 | (saveAssets ? 2 : 0));
+            }
+
+            public void Dispose()
+            {
+                if ((_flags & 1) != 0) AssetDatabase.StopAssetEditing();
+                if ((_flags & 2) != 0) AssetDatabase.SaveAssets();
+            }
+        }
     }
 
     internal struct ArraySerializedPropertyEnumerable : IEnumerable<SerializedProperty>