Rename BlendShape

.docs/Unity/Anon.unity

@@ -180,17 +180,30 @@ MonoBehaviour:
  - {fileID: 1411353995}
  - {fileID: 1411353994}
  prefabLayers: []
+ usingOnSceneLayer: 0
+ onSceneLayer:
+ removes: []
+ additions: []
  fakeSlot: {fileID: 0}
  staticRenderersSet:
  mainSet: []
  prefabLayers: []
+ usingOnSceneLayer: 0
+ onSceneLayer:
+ removes: []
+ additions: []
  fakeSlot: {fileID: 0}
  doNotMergeMaterials:
  mainSet: []
  prefabLayers: []
+ usingOnSceneLayer: 0
+ onSceneLayer:
+ removes: []
+ additions: []
  fakeSlot: {fileID: 0}
  removeEmptyRendererObject: 1
  skipEnablementMismatchedRenderers: 0
+ copyEnablementAnimation: 0
 --- !u!137 &870201505
 SkinnedMeshRenderer:
  m_ObjectHideFlags: 0
@@ -267,6 +280,10 @@ MonoBehaviour:
  - Delete_Bra
  - Delete_Pants
  prefabLayers: []
+ usingOnSceneLayer: 0
+ onSceneLayer:
+ removes: []
+ additions: []
  fakeSlot: 
 --- !u!1 &1391228312
 GameObject:
@@ -493,6 +510,9 @@ PrefabInstance:
  - targetCorrespondingSourceObject: {fileID: 7703706129674054865, guid: 8ae2a6881bbfcd84697b56e80d826039, type: 3}
  insertIndex: -1
  addedObject: {fileID: 1411354005}
+ - targetCorrespondingSourceObject: {fileID: 7703706129674054865, guid: 8ae2a6881bbfcd84697b56e80d826039, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1411354008}
  m_SourcePrefab: {fileID: 100100000, guid: 8ae2a6881bbfcd84697b56e80d826039, type: 3}
 --- !u!4 &1411353993 stripped
 Transform:
@@ -577,6 +597,10 @@ MonoBehaviour:
  - Shrink_Spine_2
  - Shrink_Hip
  prefabLayers: []
+ usingOnSceneLayer: 0
+ onSceneLayer:
+ removes: []
+ additions: []
  fakeSlot: 
  tolerance: 0.001
 --- !u!1 &1411354006 stripped
@@ -603,8 +627,10 @@ MonoBehaviour:
  optimizePhysBone: 1
  optimizeAnimator: 1
  mergeSkinnedMesh: 1
+ allowShuffleMaterialSlots: 0
+ optimizeTexture: 1
  mmdWorldCompatibility: 1
- advancedSettings:
+ debugOptions:
  exclusions: []
  gcDebug: 0
  noConfigureMergeBone: 0
@@ -615,11 +641,36 @@ MonoBehaviour:
  skipMergePhysBoneCollider: 0
  skipEntryExitToBlendTree: 0
  skipRemoveUnusedAnimatingProperties: 0
- skipMergeDirectBlendTreeLayers: 0
+ skipMergeBlendTreeLayer: 0
  skipRemoveMeaninglessAnimatorLayer: 0
  skipMergeStaticSkinnedMesh: 0
  skipMergeAnimatingSkinnedMesh: 0
+ skipMergeMaterialAnimatingSkinnedMesh: 0
  skipMergeMaterials: 0
+ skipRemoveEmptySubMesh: 0
+ skipAnyStateToEntryExit: 0
+--- !u!114 &1411354008
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1411354004}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 71ba6c5e4332471bb8048f7890eaab73, type: 3}
+ m_Name: 
+ m_EditorClassIdentifier: 
+ nameMap:
+ mainSet:
+ - key: Breast_flat
+ value: New Name
+ prefabLayers: []
+ usingOnSceneLayer: 0
+ onSceneLayer:
+ removes: []
+ additions: []
+ fakeSlot: 
 --- !u!1 &1560436838
 GameObject:
  m_ObjectHideFlags: 1

.docs/content/docs/reference/rename-blendshape/index.ja.md

@@ -0,0 +1,19 @@
+---
+title: Rename BlendShape
+weight: 30
+---
+
+# Rename BlendShape
+
+メッシュのBlendShape名を変更することが出来ます。
+
+変更後の名前が重複している場合、それらは1つのBlendShapeへと統合されます。
+
+## 設定 {#Settings}
+
+![component.png](component.png)
+
+BlendShape名の変更一覧表が表示されます。
+左上の '+' ボタンから、名前を変更するBlendShapeを追加することが出来ます。
+
+変更後の名前が重複している場合は、それらが統合されることを示すために、入力欄が黄色でハイライトされます。

.docs/content/docs/reference/rename-blendshape/index.md

@@ -0,0 +1,20 @@
+---
+title: Rename BlendShape
+weight: 30
+---
+
+# Rename BlendShape
+
+Renames BlendShapes in the Mesh.
+
+If renamed name is duplicated, it will merge the BlendShapes into one.
+
+## Settings
+
+![component.png](component.png)
+
+You'll see list of BlendShape mapping.
+
+Click upper left '+' button to add new mapping.
+
+If the renamed name is duplicated, it will be shown in yellow color to indicate that it will be merged.

.github/workflows/gameci.yml

@@ -52,6 +52,10 @@ jobs:
  customParameters: 
  checkName: Test results ${{ matrix.unity }}
 
+ - name: "Show files at root folder to find crash log"
+ if: always()
+ run: ls -la
+
  - uses: actions/upload-artifact@v4
  if: always()
  with:

CHANGELOG-PRERELEASE.md

@@ -8,6 +8,8 @@ The format is based on [Keep a Changelog].
 
 ## [Unreleased]
 ### Added
+- Rename BlendShape component to rename BlendShapes `#1245`
+ - This can be used to avoid blendShape name conflicts in Merge Skinned Mesh
 
 ### Changed
 - Performance Improvements with Mesh Manipulation, especially with blendshape-heavy meshes `#1234` `#1243` `#1240`

CHANGELOG.md

@@ -35,6 +35,8 @@ The format is based on [Keep a Changelog].
  - If you're building your avatar with batchmode with -nographics, please remove -nographics.
 - Asset Description for Avatar Modify Support bundled in an avatar, Shinano `#1189`
 - API to get in advance whether a polygon will be removed `#1177`
+- Rename BlendShape component to rename BlendShapes `#1245`
+ - This can be used to avoid blendShape name conflicts in Merge Skinned Mesh
 
 ### Changed
 - Skip Enablement Mismatched Renderers is now disabled by default `#1169`

Editor/EditSkinnedMeshComponentUtil.cs

@@ -206,6 +206,7 @@ private T CheckRecursive<T>(Func<T> compute)
  [typeof(RemoveMeshByBlendShape)] = x => new RemoveMeshByBlendShapeProcessor((RemoveMeshByBlendShape)x),
  [typeof(RemoveMeshByMask)] = x => new RemoveMeshByMaskProcessor((RemoveMeshByMask)x),
  [typeof(InternalAutoFreezeMeaninglessBlendShape)] = x => new InternalAutoFreezeMeaninglessBlendShapeProcessor((InternalAutoFreezeMeaninglessBlendShape)x),
+ [typeof(RenameBlendShape)] = x => new RenameBlendShapeProcessor((RenameBlendShape)x),
  [typeof(InternalRemoveEmptySubMesh)] = x => new RemoveEmptySubMeshProcessor((InternalRemoveEmptySubMesh)x),
  };
 

Editor/Inspector/FreezeBlendShapeEditor.cs

@@ -6,11 +6,11 @@ namespace Anatawa12.AvatarOptimizer
  [CustomEditor(typeof(FreezeBlendShape))]
  class FreezeBlendShapeEditor : AvatarTagComponentEditorBase
  {
- private PrefabSafeSet.EditorUtil<string> _shapeKeysSet = null!; // initialized in OnEnable
+ private PrefabSafeSet.PSSEditorUtil<string> _shapeKeysSet = null!; // initialized in OnEnable
 
  private void OnEnable()
  {
- _shapeKeysSet = PrefabSafeSet.EditorUtil<string>.Create(
+ _shapeKeysSet = PrefabSafeSet.PSSEditorUtil<string>.Create(
  serializedObject.FindProperty("shapeKeysSet"),
  x => x.stringValue,
  (x, v) => x.stringValue = v);
@@ -31,7 +31,12 @@ protected override void OnInspectorGUIInner()
  label.text = shapeKeyName;
  var element = _shapeKeysSet.GetElementOf(shapeKeyName);
  using (new PrefabSafeSet.PropertyScope<string>(element, rect, label))
- element.SetExistence(EditorGUI.ToggleLeft(rect, label, element.Contains));
+ {
+ EditorGUI.BeginChangeCheck();
+ var selected = EditorGUI.ToggleLeft(rect, label, element.Contains);
+ if (EditorGUI.EndChangeCheck())
+ element.SetExistence(selected);
+ }
  }
 
  using (new GUILayout.HorizontalScope())

Editor/Inspector/MergeSkinnedMeshEditor.cs

@@ -28,7 +28,7 @@ private static class Style
  SerializedProperty _removeEmptyRendererObjectProp = null!; // initialized in OnEnable
  SerializedProperty _skipEnablementMismatchedRenderers = null!; // initialized in OnEnable
  SerializedProperty _copyEnablementAnimation = null!; // initialized in OnEnable
- PrefabSafeSet.EditorUtil<Material> _doNotMergeMaterials = null!; // initialized in OnEnable
+ PrefabSafeSet.PSSEditorUtil<Material> _doNotMergeMaterials = null!; // initialized in OnEnable
 
  private void OnEnable()
  {
@@ -38,7 +38,7 @@ private void OnEnable()
  _skipEnablementMismatchedRenderers =
  serializedObject.FindProperty(nameof(MergeSkinnedMesh.skipEnablementMismatchedRenderers));
  _copyEnablementAnimation = serializedObject.FindProperty(nameof(MergeSkinnedMesh.copyEnablementAnimation));
- _doNotMergeMaterials = PrefabSafeSet.EditorUtil<Material>.Create(
+ _doNotMergeMaterials = PrefabSafeSet.PSSEditorUtil<Material>.Create(
  serializedObject.FindProperty("doNotMergeMaterials"),
  x => (Material)x.objectReferenceValue,
  (x, v) => x.objectReferenceValue = v);
@@ -94,7 +94,13 @@ public void MergeMaterials(MergeSkinnedMesh merge)
  var fieldPosition = EditorGUILayout.GetControlRect();
  var label = new GUIContent(AAOL10N.Tr("MergeSkinnedMesh:label:Merge"));
  using (new PrefabSafeSet.PropertyScope<Material>(element, fieldPosition, label))
- element.SetExistence(!EditorGUI.ToggleLeft(fieldPosition, label, !element.Contains));
+ {
+
+ EditorGUI.BeginChangeCheck();
+ var selected = !EditorGUI.ToggleLeft(fieldPosition, label, !element.Contains);
+ if (EditorGUI.EndChangeCheck())
+ element.SetExistence(selected);
+ }
 
  EditorGUILayout.LabelField(AAOL10N.Tr("MergeSkinnedMesh:label:Renderers"));
  EditorGUI.indentLevel++;

Editor/Inspector/RemoveMeshByBlendShapeEditor.cs

@@ -7,7 +7,7 @@ namespace Anatawa12.AvatarOptimizer
  [CustomEditor(typeof(RemoveMeshByBlendShape))]
  internal class RemoveMeshByBlendShapeEditor : AvatarTagComponentEditorBase
  {
- private PrefabSafeSet.EditorUtil<string> _shapeKeysSet = null!; // initialized in OnEnable
+ private PrefabSafeSet.PSSEditorUtil<string> _shapeKeysSet = null!; // initialized in OnEnable
  private SerializedProperty _toleranceProp = null!; // initialized in OnEnable
  private SkinnedMeshRenderer? _renderer;
  public bool automaticallySetWeightWhenToggle;
@@ -16,7 +16,7 @@ private void OnEnable()
  {
  NativeLeakDetection.Mode = NativeLeakDetectionMode.EnabledWithStackTrace;
  _renderer = targets.Length == 1 ? ((Component)target).GetComponent<SkinnedMeshRenderer>() : null;
- _shapeKeysSet = PrefabSafeSet.EditorUtil<string>.Create(
+ _shapeKeysSet = PrefabSafeSet.PSSEditorUtil<string>.Create(
  serializedObject.FindProperty("shapeKeysSet"),
  x => x.stringValue,
  (x, v) => x.stringValue = v);