Always enable SkinnedMeshRenderer component that gets other meshes me…

…rged into it. #15
d4rkc0d3r · Nov 10, 2022 · 882eb1d · 882eb1d
1 parent 37d4983
commit 882eb1d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Bug Fixes
 * Fix parents of animated transforms getting deleted. [(more)](https://github.com/d4rkc0d3r/d4rkAvatarOptimizer/issues/14)
+* Always enable SkinnedMeshRenderer component that gets other meshes merged into it. [(more)](https://github.com/d4rkc0d3r/d4rkAvatarOptimizer/issues/15)
 
 ## v1.7
 ### Bug Fixes

diff --git a/src/d4rkAvatarOptimizerEditor.cs b/src/d4rkAvatarOptimizerEditor.cs
@@ -1258,7 +1258,6 @@ private static void SaveOptimizedMaterials()
                 }
             }
             Profiler.EndSection();
-            CreateUniqueAsset(mat, mat.name + ".mat");
         }
 
         var skinnedMeshRenderers = root.GetComponentsInChildren<SkinnedMeshRenderer>(true);
@@ -1317,10 +1316,11 @@ private static void SaveOptimizedMaterials()
                     }
                 }
             }
+        }
 
-            Profiler.StartSection("AssetDatabase.SaveAssets()");
-            AssetDatabase.SaveAssets();
-            Profiler.EndSection();
+        foreach (var mat in optimizedMaterials)
+        {
+            CreateUniqueAsset(mat, mat.name + ".mat");
         }
     }
 
@@ -2124,7 +2124,11 @@ private static void CombineSkinnedMeshes()
                 }
             }
 
-            meshRenderer.gameObject.SetActive(true);
+            if (combinableSkinnedMeshes.Count > 1)
+            {
+                meshRenderer.gameObject.SetActive(true);
+                meshRenderer.enabled = true;
+            }
 
             Profiler.StartSection("AssetDatabase.SaveAssets()");
             AssetDatabase.SaveAssets();