From b5a7c1b13bdc4d01cfeefb54f162e519287a7103 Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Mon, 4 Dec 2023 17:04:44 +0900
Subject: [PATCH] remove GltfMeshUtility.ForceUniqueName.

automatically force when createAvatar
---
 Assets/UniGLTF/Editor/MeshUtility/MeshUtilityDialog.cs |  3 +--
 Assets/UniGLTF/Runtime/MeshUtility/GltfMeshUtility.cs  |  6 ------
 .../VRM/Runtime/SkinnedMeshUtility/VrmMeshUtility.cs   | 10 ----------
 Assets/VRM10/Runtime/MeshUtility/Vrm10MeshUtility.cs   | 10 ----------
 4 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/Assets/UniGLTF/Editor/MeshUtility/MeshUtilityDialog.cs b/Assets/UniGLTF/Editor/MeshUtility/MeshUtilityDialog.cs
index 3a35821f2..7caaf44ae 100644
--- a/Assets/UniGLTF/Editor/MeshUtility/MeshUtilityDialog.cs
+++ b/Assets/UniGLTF/Editor/MeshUtility/MeshUtilityDialog.cs
@@ -280,11 +280,10 @@ namespace UniGLTF.MeshUtility
 
         bool MeshFreezeGui()
         {
-            var forceUniqueName = ToggleIsModified("ForceUniqueName", ref MeshUtility.ForceUniqueName);
             var blendShape = ToggleIsModified("BlendShape", ref MeshUtility.FreezeBlendShape);
             var scale = ToggleIsModified("Scale", ref MeshUtility.FreezeScaling);
             var rotation = ToggleIsModified("Rotation", ref MeshUtility.FreezeRotation);
-            return forceUniqueName || blendShape || scale || rotation;
+            return blendShape || scale || rotation;
         }
 
         protected virtual bool MeshIntegrateGui()
diff --git a/Assets/UniGLTF/Runtime/MeshUtility/GltfMeshUtility.cs b/Assets/UniGLTF/Runtime/MeshUtility/GltfMeshUtility.cs
index bffca8e6d..ce3b5a23b 100644
--- a/Assets/UniGLTF/Runtime/MeshUtility/GltfMeshUtility.cs
+++ b/Assets/UniGLTF/Runtime/MeshUtility/GltfMeshUtility.cs
@@ -17,12 +17,6 @@ namespace UniGLTF.MeshUtility
     /// </summary>
     public class GltfMeshUtility
     {
-        /// <summary>
-        /// GameObject 名が重複している場合にリネームする。
-        /// 最初に実行(Avatar生成時のエラーを回避？)
-        /// </summary>
-        public bool ForceUniqueName = false;
-
         /// <summary>
         /// Same as VRM-0 normalization
         /// - Mesh
diff --git a/Assets/VRM/Runtime/SkinnedMeshUtility/VrmMeshUtility.cs b/Assets/VRM/Runtime/SkinnedMeshUtility/VrmMeshUtility.cs
index 37a9abdf8..aa3e0b272 100644
--- a/Assets/VRM/Runtime/SkinnedMeshUtility/VrmMeshUtility.cs
+++ b/Assets/VRM/Runtime/SkinnedMeshUtility/VrmMeshUtility.cs
@@ -98,16 +98,6 @@ namespace VRM
                 throw new ArgumentException();
             }
 
-            if (ForceUniqueName)
-            {
-                throw new NotImplementedException();
-
-                // 必用？
-                var animator = target.GetComponent<Animator>();
-                var newAvatar = AvatarDescription.RecreateAvatar(animator);
-                animator.avatar = newAvatar;
-            }
-
             // TODO: update: spring
             // TODO: update: constraint
             // TODO: update: firstPerson offset
diff --git a/Assets/VRM10/Runtime/MeshUtility/Vrm10MeshUtility.cs b/Assets/VRM10/Runtime/MeshUtility/Vrm10MeshUtility.cs
index c106b6c28..7c4330a98 100644
--- a/Assets/VRM10/Runtime/MeshUtility/Vrm10MeshUtility.cs
+++ b/Assets/VRM10/Runtime/MeshUtility/Vrm10MeshUtility.cs
@@ -102,16 +102,6 @@ namespace UniVRM10
                 throw new ArgumentException();
             }
 
-            if (ForceUniqueName)
-            {
-                throw new NotImplementedException();
-
-                // 必用？
-                var animator = target.GetComponent<Animator>();
-                var newAvatar = AvatarDescription.RecreateAvatar(animator);
-                animator.avatar = newAvatar;
-            }
-
             // TODO: update: spring
             // TODO: update: constraint
             // TODO: update: firstPerson offset