charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More #if fixes (again)

Browse Source
This commit is contained in:
vis2k 2019-01-21 14:38:53 +01:00
parent 632cb1b483
commit e969fcf26c
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Mirror/Runtime/NetworkIdentity.cs
View File

@ -247,6 +247,11 @@ bool ThisIsASceneObjectWithPrefabParent(out GameObject prefab)
return false;
}
prefab = (GameObject)PrefabUtility.GetCorrespondingObjectFromSource(gameObject);
#elif UNITY_2018_2_OR_NEWER
PrefabType prefabType = PrefabUtility.GetPrefabType(gameObject);
if (prefabType == PrefabType.None)
return false;
prefab = (GameObject)PrefabUtility.GetCorrespondingObjectFromSource(gameObject);
#else
PrefabType prefabType = PrefabUtility.GetPrefabType(gameObject);
if (prefabType == PrefabType.None)

2
Assets/Mirror/Runtime/NetworkServer.cs
View File

@ -931,6 +931,8 @@ static bool CheckForPrefab(GameObject obj)
#if UNITY_EDITOR
#if UNITY_2018_3_OR_NEWER
return UnityEditor.PrefabUtility.IsPartOfPrefabAsset(obj);
#elif UNITY_2018_2_OR_NEWER
return (UnityEditor.PrefabUtility.GetCorrespondingObjectFromSource(obj) == null) && (UnityEditor.PrefabUtility.GetPrefabObject(obj) != null);
#else
return (UnityEditor.PrefabUtility.GetPrefabParent(obj) == null) && (UnityEditor.PrefabUtility.GetPrefabObject(obj) != null);
#endif