chore: Directly set to PrefabSafeSet in InternalAutoFreezeMeaningless…

…BlendShapeProcessor
anatawa12 · Oct 3, 2023 · 92fc1a6 · 92fc1a6
1 parent 3ee84c5
commit 92fc1a6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/Editor/Processors/SkinnedMeshes/InternalAutoFreezeMeaninglessBlendShapeProcessor.cs b/Editor/Processors/SkinnedMeshes/InternalAutoFreezeMeaninglessBlendShapeProcessor.cs
@@ -21,13 +21,9 @@ public override void Process(BuildContext context, MeshInfo2 target)
                 meaningfulBlendShapes.UnionWith(vertex.BlendShapes.Keys);
 
             var freezeBlendShape = Target.GetComponent<FreezeBlendShape>();
-            var serialized = new SerializedObject(freezeBlendShape);
-            var editorUtil = PrefabSafeSet.EditorUtil<string>.Create(
-                serialized.FindProperty(nameof(FreezeBlendShape.shapeKeysSet)),
-                0, p => p.stringValue, (p, v) => p.stringValue = v);
-            foreach (var (meaningLess, _) in target.BlendShapes.Where(x => !meaningfulBlendShapes.Contains(x.name)))
-                editorUtil.GetElementOf(meaningLess).EnsureAdded();
-            serialized.ApplyModifiedPropertiesWithoutUndo();
+            var set = freezeBlendShape.shapeKeysSet.GetAsSet();
+            set.UnionWith(target.BlendShapes.Where(x => !meaningfulBlendShapes.Contains(x.name)).Select(x => x.name));
+            freezeBlendShape.shapeKeysSet.SetValueNonPrefab(set);
         }
 
         // nothing to do

diff --git a/Internal/PrefabSafeSet/Runtime/PrefabSafeSet.cs b/Internal/PrefabSafeSet/Runtime/PrefabSafeSet.cs
@@ -81,6 +81,17 @@ protected PrefabSafeSet(Object outerObject)
 #endif
         }
 
+        public void SetValueNonPrefab(IEnumerable<T> values)
+        {
+#if UNITY_EDITOR
+            if (OuterObject && UnityEditor.PrefabUtility.IsPartOfPrefabInstance(OuterObject)
+                            && UnityEditor.PrefabUtility.IsPartOfAnyPrefab(OuterObject))
+                throw new InvalidOperationException("You cannot set value to Prefab Instance or Prefab");
+            Debug.Assert(prefabLayers.Length == 0);
+#endif
+            mainSet = values.ToArray();
+        }
+
         public HashSet<T> GetAsSet()
         {
             var result = new HashSet<T>(mainSet.Where(x => x.IsNotNull()));