diff --git a/Scripts/BlendShape/Editor/VRMBlendShapeManipulatorEditor.cs b/Scripts/BlendShape/Editor/VRMBlendShapeManipulatorEditor.cs index ae5e41aaa..a7f416eb8 100644 --- a/Scripts/BlendShape/Editor/VRMBlendShapeManipulatorEditor.cs +++ b/Scripts/BlendShape/Editor/VRMBlendShapeManipulatorEditor.cs @@ -120,7 +120,11 @@ namespace VRM var assetPath = string.Format("Assets/{0}.{1}.asset", m_target.name, maxWeightName); +#if UNITY_2018_2_OR_NEWER + var prefab = PrefabUtility.GetCorrespondingObjectFromSource(m_target.gameObject); +#else var prefab = PrefabUtility.GetPrefabParent(m_target.gameObject); +#endif if (prefab != null) { var prefabPath = AssetDatabase.GetAssetPath(prefab); diff --git a/Scripts/SkinnedMeshUtility/Editor/BoneMeshEraserWizard.cs b/Scripts/SkinnedMeshUtility/Editor/BoneMeshEraserWizard.cs index 7933d8970..6973fdf03 100644 --- a/Scripts/SkinnedMeshUtility/Editor/BoneMeshEraserWizard.cs +++ b/Scripts/SkinnedMeshUtility/Editor/BoneMeshEraserWizard.cs @@ -168,7 +168,11 @@ namespace VRM // save mesh to Assets var assetPath = string.Format("{0}{1}", go.name, ASSET_SUFFIX); +#if UNITY_2018_2_OR_NEWER + var prefab = PrefabUtility.GetCorrespondingObjectFromSource(go); +#else var prefab = PrefabUtility.GetPrefabParent(go); +#endif if (prefab != null) { var prefabPath = AssetDatabase.GetAssetPath(prefab); diff --git a/Scripts/SkinnedMeshUtility/Editor/MeshIntegrator.cs b/Scripts/SkinnedMeshUtility/Editor/MeshIntegrator.cs index 7b2575416..55c860b0a 100644 --- a/Scripts/SkinnedMeshUtility/Editor/MeshIntegrator.cs +++ b/Scripts/SkinnedMeshUtility/Editor/MeshIntegrator.cs @@ -44,7 +44,11 @@ namespace VRM // save mesh to Assets var assetPath = string.Format("{0}{1}", go.name, ASSET_SUFFIX); +#if UNITY_2018_2_OR_NEWER + var prefab = PrefabUtility.GetCorrespondingObjectFromSource(go); +#else var prefab = PrefabUtility.GetPrefabParent(go); +#endif if (prefab != null) { var prefabPath = AssetDatabase.GetAssetPath(prefab); diff --git a/UniGLTF b/UniGLTF index 1ad983a65..fae0f5e1f 160000 --- a/UniGLTF +++ b/UniGLTF @@ -1 +1 @@ -Subproject commit 1ad983a65b74cee1b0351f21b77e39344dcf76d9 +Subproject commit fae0f5e1f44f8c0fe06c9fd2c61ac99e513c7141 diff --git a/pull.bat.meta b/pull.bat.meta deleted file mode 100644 index 02c4fae13..000000000 --- a/pull.bat.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c27f018409a99674892d7bab2dc4ed66 -timeCreated: 1522043090 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: