Merge pull request #447 from Unity-Technologies/UNI-64610-disable-linked-prefab-in-2018.3

Uni 64610 disable linked prefab in 2018.3

Author: vkovec

.gitignore

@@ -55,6 +55,7 @@ ExportedObj/
 
 # Unity3D generated meta files
 *.pidb.meta
+*.DS_Store
 
 # Unity3D Generated File On Crash Reports
 sysinfo.txt

TestProjects/FbxTests/Assets/Editor/FbxTests/ConvertToModelTest.cs

@@ -1,3 +1,4 @@
+#if !UNITY_2018_3_OR_NEWER
 using UnityEngine;
 using UnityEditor;
 using NUnit.Framework;
@@ -499,3 +500,4 @@ public void TestConvertModelInstance()
         }
     }
 }
+#endif // !UNITY_2018_3_OR_NEWER

TestProjects/FbxTests/Assets/Editor/FbxTests/FbxPrefabAutoUpdaterTest.cs

@@ -1,3 +1,4 @@
+#if !UNITY_2018_3_OR_NEWER
 using UnityEngine;
 using UnityEditor;
 using NUnit.Framework;
@@ -431,3 +432,4 @@ public void ExpensivePerformanceTest ()
         }
     }
 }
+#endif // !UNITY_2018_3_OR_NEWER

TestProjects/FbxTests/Assets/Editor/FbxTests/FbxPrefabTest.cs

@@ -1,3 +1,4 @@
+#if !UNITY_2018_3_OR_NEWER
 using UnityEngine;
 using UnityEditor;
 using NUnit.Framework;
@@ -700,3 +701,4 @@ public void TestFbxRepresentation()
         }
     }
 }
+#endif // !UNITY_2018_3_OR_NEWER

TestProjects/FbxTests/Assets/Editor/FbxTests/ModelExporterTest.cs

@@ -821,6 +821,7 @@ public void LODExportTest(){
             expectedChildren = new HashSet<string> () { cubeLOD2.name };
             CompareGameObjectChildren (fbxObj, expectedChildren);
 
+#if !UNITY_2018_3_OR_NEWER
             // test convert to prefab
             // this should have the same result as "export all"
             // expected LODs exported: Sphere_LOD0, Capsule_LOD0, Cube_LOD2
@@ -839,6 +840,7 @@ public void LODExportTest(){
 
             expectedChildren = new HashSet<string> () { sphereLOD0.name, capsuleLOD0.name, cubeLOD2.name };
             CompareGameObjectChildren (fbxObj, expectedChildren);
+#endif
         }
 
 

TestProjects/FbxTests/Assets/Scripts/ExporterTestBase.cs

@@ -14,17 +14,21 @@ public abstract class ExporterTestBase : ExporterTestBaseAPI
         [TearDown]
         public override void Term ()
         {
+#if !UNITY_2018_3_OR_NEWER
             // Put back the initial setting for the auto-updater toggle
             ExportSettings.instance.AutoUpdaterEnabled = isAutoUpdaterOn;
+#endif
             base.Term();
         }
 
         [SetUp]
         public override void Init()
         {
             base.Init();
+#if !UNITY_2018_3_OR_NEWER
             isAutoUpdaterOn = ExportSettings.instance.AutoUpdaterEnabled;
             ExportSettings.instance.AutoUpdaterEnabled = true;
+#endif
         }
 
         /// <summary>

proto.com.unity.formats.fbx/Documentation~/TableOfContents.md

@@ -1,6 +1,8 @@
 * [FBX Exporter](index)
-    * [Exporting FBX files from Unity](exporting)
-    * [Converting GameObjects to Linked Prefabs](prefabs)
-    * [Integrating Unity with 3D modeling software](integration)
-    * [Setting FBX Export options](options)
-    * [Developer's guide](devguide)
+* [Exporting FBX files from Unity](exporting)
+* [Using Prefabs to connect Unity and your 3D modeling software](prefabs-overview)
+    * [Unity 2018.2: Linked Prefabs](prefabs)
+    * [Unity 2018.3: Variant Prefabs](nested-prefabs)
+* [Integrating Unity with 3D modeling software](integration)
+* [Setting FBX Export options](options)
+* [Developer's guide](devguide)