Merge 2018.3 -> master

Author: turadr

.gitattributes

@@ -0,0 +1,13 @@
+*         text=auto
+# Text files
+*.cs diff=csharp text
+*.txt     text
+*.mat     text
+*.shader  text
+*.meta    text
+*.md5     text
+*.compute text
+*.md      text
+*.prefab  text
+*/ProjectSettings/*.asset text
+

.gitignore

@@ -1,6 +1,26 @@
-Library/*
-Temp/*
-Assembly-CSharp-Editor.csproj
-Assembly-CSharp.csproj
-NavMeshComponents.sln
-NavMeshComponents.userprefs
+**/Library/
+**/Temp/
+**/obj/
+
+**/.vscode/
+**/.vs
+
+**/Assets/Plugins/*
+**/Assets/Plugins.meta
+
+*.idea
+*.csproj
+*.sln
+*.suo
+*.userprefs
+*.app
+*.VC.*
+.DS_Store
+*~
+*.swp
+
+.vs/
+build/*
+*.rsp
+*.pyc
+/Logs

Assets/Examples/Editor/NavMeshPrefabInstanceEditor.cs

@@ -2,7 +2,6 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.AI;
-using NavMeshBuilder = UnityEngine.AI.NavMeshBuilder;
 
 [CanEditMultipleObjects]
 [CustomEditor(typeof(NavMeshPrefabInstance))]
@@ -38,7 +37,7 @@ public override void OnInspectorGUI()
 
     void OnInspectorGUIPrefab(GameObject go)
     {
-        var prefab = PrefabUtility.GetPrefabObject(go);
+        var prefab = PrefabUtility.GetPrefabInstanceHandle(go);
         var path = AssetDatabase.GetAssetPath(prefab);
 
         if (prefab && string.IsNullOrEmpty(path))
@@ -71,7 +70,8 @@ NavMeshData Build(NavMeshPrefabInstance instance)
         var sources = new List<NavMeshBuildSource>();
         var markups = new List<NavMeshBuildMarkup>();
 
-        NavMeshBuilder.CollectSources(root, ~0, NavMeshCollectGeometry.RenderMeshes, 0, markups, sources);
+        UnityEditor.AI.NavMeshBuilder.CollectSourcesInStage(
+            root, ~0, NavMeshCollectGeometry.RenderMeshes, 0, markups, instance.gameObject.scene, sources);
         var settings = NavMesh.GetSettingsByID(0);
         var bounds = new Bounds(Vector3.zero, 1000.0f * Vector3.one);
         var navmesh = NavMeshBuilder.BuildNavMeshData(settings, sources, bounds, root.position, root.rotation);
@@ -85,7 +85,7 @@ void OnClear()
         {
             var instance = (NavMeshPrefabInstance)tgt;
             var go = instance.gameObject;
-            var prefab = PrefabUtility.GetPrefabObject(go);
+            var prefab = PrefabUtility.GetPrefabInstanceHandle(go);
             var path = AssetDatabase.GetAssetPath(prefab);
 
             if (string.IsNullOrEmpty(path))
@@ -105,7 +105,7 @@ void OnBake()
         {
             var instance = (NavMeshPrefabInstance)tgt;
             var go = instance.gameObject;
-            var prefab = PrefabUtility.GetPrefabObject(go);
+            var prefab = PrefabUtility.GetPrefabInstanceHandle(go);
             var path = AssetDatabase.GetAssetPath(prefab);
 
             if (string.IsNullOrEmpty(path))