diff --git a/Assets/UniGLTF/Editor/MeshUtility/MaterialKey.cs.meta b/Assets/UniGLTF/Editor/MeshUtility/MaterialKey.cs.meta deleted file mode 100644 index e6645775a..000000000 --- a/Assets/UniGLTF/Editor/MeshUtility/MaterialKey.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 91c86a6f42c50c9438c124f0dbd048a7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniGLTF/Editor/MeshUtility/MeshUtilityDialog.cs b/Assets/UniGLTF/Editor/MeshUtility/MeshUtilityDialog.cs index 1c10a6eab..3ef6ff0de 100644 --- a/Assets/UniGLTF/Editor/MeshUtility/MeshUtilityDialog.cs +++ b/Assets/UniGLTF/Editor/MeshUtility/MeshUtilityDialog.cs @@ -249,13 +249,15 @@ namespace UniGLTF.MeshUtility { var childAssetPath = $"{assetFolder}/{result.Integrated.IntegratedRenderer.gameObject.name}{ASSET_SUFFIX}"; Debug.LogFormat("CreateAsset: {0}", childAssetPath); - result.Integrated.WriteAndReload(childAssetPath); + AssetDatabase.CreateAsset(result.Integrated.IntegratedRenderer.sharedMesh, childAssetPath); + result.Integrated.Reload(childAssetPath); } if (result.IntegratedNoBlendShape != null) { var childAssetPath = $"{assetFolder}/{result.IntegratedNoBlendShape.IntegratedRenderer.gameObject.name}{ASSET_SUFFIX}"; Debug.LogFormat("CreateAsset: {0}", childAssetPath); - result.IntegratedNoBlendShape.WriteAndReload(childAssetPath); + AssetDatabase.CreateAsset(result.Integrated.IntegratedRenderer.sharedMesh, childAssetPath); + result.IntegratedNoBlendShape.Reload(childAssetPath); } } diff --git a/Assets/UniGLTF/Runtime/MeshUtility/MeshIntegrationResult.cs b/Assets/UniGLTF/Runtime/MeshUtility/MeshIntegrationResult.cs index 20103d21d..a87c8ad31 100644 --- a/Assets/UniGLTF/Runtime/MeshUtility/MeshIntegrationResult.cs +++ b/Assets/UniGLTF/Runtime/MeshUtility/MeshIntegrationResult.cs @@ -2,9 +2,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -#if UNITY_EDITOR -using UnityEditor; -#endif + namespace UniGLTF.MeshUtility { @@ -33,17 +31,14 @@ namespace UniGLTF.MeshUtility IntegratedRenderer = smr; } -#if UNITY_EDITOR - public void WriteAndReload(string assetPath) + public void Reload(string assetPath) { - AssetDatabase.CreateAsset(IntegratedRenderer.sharedMesh, assetPath); var unityPath = UnityPath.FromUnityPath(assetPath); unityPath.ImportAsset(); var mesh = unityPath.LoadAsset(); // replace reloaded IntegratedRenderer.sharedMesh = mesh; } -#endif } public class MeshIntegrationResult diff --git a/Assets/VRM10/Editor/MeshUtility/Vrm10ExpressionUpdater.cs b/Assets/VRM10/Editor/MeshUtility/Vrm10ExpressionUpdater.cs index 04f86a4ff..e4c1c6ff2 100644 --- a/Assets/VRM10/Editor/MeshUtility/Vrm10ExpressionUpdater.cs +++ b/Assets/VRM10/Editor/MeshUtility/Vrm10ExpressionUpdater.cs @@ -71,9 +71,10 @@ namespace UniVRM10 } else { -#if VRM_DEVELOP - Debug.Log($"{val} >> {binding}"); -#endif + if (VRMShaders.Symbols.VRM_DEVELOP) + { + Debug.Log($"{val} >> {binding}"); + } used.Add(binding); yield return binding; }