Skip to content

Commit

Permalink
Showing 3 changed files with 13 additions and 5 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG-PRERELEASE.md
Original file line number Diff line number Diff line change
@@ -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

3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

12 changes: 7 additions & 5 deletions Runtime/MergeSkinnedMesh.cs
Original file line number Diff line number Diff line change
@@ -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:

0 comments on commit 9edfd4d

Please sign in to comment.