Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-23 02:55:07 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UNITY_2018_2_OR_NEWER

Browse Source
This commit is contained in:
ousttrue
2018-10-10 17:50:21 +09:00
parent bab75cd600
commit d07a0c6775
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Scripts/BlendShape/Editor/VRMBlendShapeManipulatorEditor.cs
View File

@@ -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);

4
Scripts/SkinnedMeshUtility/Editor/BoneMeshEraserWizard.cs
View File

@@ -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);

4
Scripts/SkinnedMeshUtility/Editor/MeshIntegrator.cs
View File

@@ -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);

2
UniGLTF

Submodule UniGLTF updated: 1ad983a65b...fae0f5e1f4

9
pull.bat.meta
View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: c27f018409a99674892d7bab2dc4ed66
timeCreated: 1522043090
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: