From 030f1a6f835421d57432b7deaa4b8d29f7cbcc85 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Sat, 31 Aug 2024 23:06:54 +0900
Subject: [PATCH 1/2] chore: skipEnablementMismatchedRenderers is now disabled
 by default

---
 Runtime/MergeSkinnedMesh.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Runtime/MergeSkinnedMesh.cs b/Runtime/MergeSkinnedMesh.cs
index 75900ba55..65dae8597 100644
--- a/Runtime/MergeSkinnedMesh.cs
+++ b/Runtime/MergeSkinnedMesh.cs
@@ -37,11 +37,6 @@ public sealed class MergeSkinnedMesh : EditSkinnedMeshComponent, ISourceSkinnedM
 
         APIChecker _checker;
 
-        private void Reset()
-        {
-            skipEnablementMismatchedRenderers = true;
-        }
-
         internal MergeSkinnedMesh()
         {
             renderersSet = new PrefabSafeSet.PrefabSafeSet<SkinnedMeshRenderer>(this);
@@ -59,6 +54,10 @@ internal MergeSkinnedMesh()
         /// <param name="version">
         /// The default configuration version.
         /// Since 1.7.0, version 1 is supported.
+        ///
+        /// Since 1.8.0, version 2 is supported.
+        /// Changes:
+        /// - Default value for skipEnablementMismatchedRenderers is changed. Before 1.8.0: true, 1.8.0 and later: false
         /// </param>
         /// <exception cref="ArgumentOutOfRangeException">Unsupported configuration version</exception>
         [PublicAPI]
@@ -67,6 +66,9 @@ public void Initialize(int version)
             switch (version)
             {
                 case 1:
+                    skipEnablementMismatchedRenderers = true;
+                    goto case 2;
+                case 2:
                     // nothing to do
                     break; 
                 default:

From eff2093f3acaeb4b5bb99b808c1647682f8f1b01 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Sat, 31 Aug 2024 23:14:59 +0900
Subject: [PATCH 2/2] docs(changelog): Skip Enablement Mismatched Renderers is
 now disabled by default

---
 CHANGELOG-PRERELEASE.md | 3 +++
 CHANGELOG.md            | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
index 36f7610ea..75b9af822 100644
--- a/CHANGELOG-PRERELEASE.md
+++ b/CHANGELOG-PRERELEASE.md
@@ -16,6 +16,9 @@ The format is based on [Keep a Changelog].
   - Combined with Entry / Exit to 1D BlendTree optimization, which is implemented in previous release, your AnyState layer may be optimized to 1D BlendTree.
 
 ### Changed
+- Skip Enablement Mismatched Renderers is now disabled by default `#1169`
+  - You still can enable it in the Inspector.
+  - This change does not affect the behavior of previously added components.
 
 ### Deprecated
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14a785ba8..f15e21e91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,9 @@ The format is based on [Keep a Changelog].
   - Combined with Entry / Exit to 1D BlendTree optimization, which is implemented in previous release, your AnyState layer may be optimized to 1D BlendTree.
 
 ### Changed
+- Skip Enablement Mismatched Renderers is now disabled by default `#1169`
+  - You still can enable it in the Inspector.
+  - This change does not affect the behavior of previously added components.
 
 ### Deprecated