From 566f07fc14185b1938c25ceb9c93b29b31ff87ba Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 13 Jun 2022 18:10:53 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"MeshUtility.SeparationProcessing=20?= =?UTF-8?q?=E3=82=92=20public=20=E3=81=AB=E3=81=99=E3=82=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/UniGLTF/Editor/MeshUtility/TabMeshSeparator.cs | 2 +- Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs | 4 ++-- Assets/UniGLTF/package.json | 4 ++-- Assets/VRM/Runtime/Format/VRMVersion.cs | 4 ++-- Assets/VRM/Samples~/BlendShapeMenu/BlendShapeMenu.cs | 2 -- Assets/VRM/package.json | 6 +++--- Assets/VRM10/package.json | 6 +++--- Assets/VRMShaders/package.json | 2 +- 8 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Assets/UniGLTF/Editor/MeshUtility/TabMeshSeparator.cs b/Assets/UniGLTF/Editor/MeshUtility/TabMeshSeparator.cs index 6e512c858..3dab965b2 100644 --- a/Assets/UniGLTF/Editor/MeshUtility/TabMeshSeparator.cs +++ b/Assets/UniGLTF/Editor/MeshUtility/TabMeshSeparator.cs @@ -104,7 +104,7 @@ namespace UniGLTF.MeshUtility /// /// /// (Mesh 分割前, Mesh BlendShape有り、Mesh BlendShape無し)のリストを返す - public static List<(Mesh Src, Mesh With, Mesh Without)> SeparationProcessing(GameObject go) + private static List<(Mesh Src, Mesh With, Mesh Without)> SeparationProcessing(GameObject go) { var list = new List<(Mesh Src, Mesh With, Mesh Without)>(); var skinnedMeshRenderers = go.GetComponentsInChildren(); diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs index 8f8d37194..1a06bbd57 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs @@ -5,7 +5,7 @@ namespace UniGLTF { public const int MAJOR = 2; public const int MINOR = 35; - public const int PATCH = 1; - public const string VERSION = "2.35.1"; + public const int PATCH = 0; + public const string VERSION = "2.35.0"; } } diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json index f01f71fe8..e7f57c286 100644 --- a/Assets/UniGLTF/package.json +++ b/Assets/UniGLTF/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.gltf", - "version": "0.99.1", + "version": "0.99.0", "displayName": "UniGLTF", "description": "GLTF importer and exporter", "unity": "2019.4", @@ -11,6 +11,6 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.99.1" + "com.vrmc.vrmshaders": "0.99.0" } } \ No newline at end of file diff --git a/Assets/VRM/Runtime/Format/VRMVersion.cs b/Assets/VRM/Runtime/Format/VRMVersion.cs index ec9b7812d..abb1af93c 100644 --- a/Assets/VRM/Runtime/Format/VRMVersion.cs +++ b/Assets/VRM/Runtime/Format/VRMVersion.cs @@ -5,7 +5,7 @@ namespace VRM { public const int MAJOR = 0; public const int MINOR = 99; - public const int PATCH = 1; - public const string VERSION = "0.99.1"; + public const int PATCH = 0; + public const string VERSION = "0.99.0"; } } diff --git a/Assets/VRM/Samples~/BlendShapeMenu/BlendShapeMenu.cs b/Assets/VRM/Samples~/BlendShapeMenu/BlendShapeMenu.cs index 096b9ccc0..7cbdc8ee4 100644 --- a/Assets/VRM/Samples~/BlendShapeMenu/BlendShapeMenu.cs +++ b/Assets/VRM/Samples~/BlendShapeMenu/BlendShapeMenu.cs @@ -78,7 +78,6 @@ namespace VRM.Sample.BlendShapeMenu return "Assets" + src.Substring(Application.dataPath.Length); } -#if UNITY_EDITOR [MenuItem("CONTEXT/BlendShapeAvatar/Add ARKit FaceTracking BlendShapes")] public static void AddARKitFaceTrackingBlendShapes(MenuCommand command) { @@ -177,6 +176,5 @@ namespace VRM.Sample.BlendShapeMenu Debug.Log($"Assign\n" + sb.ToString()); } -#endif } } diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index 661e58a8d..5606559ff 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.univrm", - "version": "0.99.1", + "version": "0.99.0", "displayName": "VRM", "description": "VRM importer", "unity": "2019.4", @@ -14,8 +14,8 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.99.1", - "com.vrmc.gltf": "0.99.1" + "com.vrmc.vrmshaders": "0.99.0", + "com.vrmc.gltf": "0.99.0" }, "samples": [ { diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json index de3066cae..c86e9719a 100644 --- a/Assets/VRM10/package.json +++ b/Assets/VRM10/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrm", - "version": "0.99.1", + "version": "0.99.0", "displayName": "VRM-1.0β", "description": "VRM-1.0β importer", "unity": "2019.4", @@ -14,8 +14,8 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.99.1", - "com.vrmc.gltf": "0.99.1" + "com.vrmc.vrmshaders": "0.99.0", + "com.vrmc.gltf": "0.99.0" }, "samples": [ { diff --git a/Assets/VRMShaders/package.json b/Assets/VRMShaders/package.json index a561ffaed..833d27219 100644 --- a/Assets/VRMShaders/package.json +++ b/Assets/VRMShaders/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrmshaders", - "version": "0.99.1", + "version": "0.99.0", "displayName": "VRM Shaders", "description": "VRM Shaders", "unity": "2019.4",