Merge pull request #539 from Unity-Technologies/v3.2.1-preview

v3.2.1 preview

Author: vkovec

.yamato/upm-ci.yml

@@ -2,7 +2,6 @@ test_trigger_editors:
   - version: 2018.4
   - version: 2019.4
 publish_trigger_editors:
-  - version: 2018.3
   - version: 2018.4
   - version: 2019.1
   - version: 2019.2

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changes in Fbx Exporter
 
-## [3.2.1-preview.1] - 2020-08-05
+## [3.2.1-preview.2] - 2020-08-05
 ### Added
 - Add an export option to preserve model import settings when overwriting an fbx file.
 - Add the option to export FBX files outside of the Assets folder.
@@ -10,11 +10,13 @@
 - Renamed Export as FBX Linked Prefab to Export as FBX Prefab Variant.
 - Mesh instances are now exported as instances of a single mesh instead of exporting multiple, identical meshes.
 - Updated to latest com.autodesk.fbx (3.1.0-preview.2).
+- Updated minimum supported Unity version to 2018.4.
 
 ### Fixed
 - No longer initiate export if no objects are selected in Autodesk® 3ds Max®.
 - Added a null check for bones, so export no longer fails if a skeleton has missing bones.
 - Fix incorrect relative paths for textures in FBX files.
+- Fix for Editor focus lockup when creating an FBX Prefab Variant on Mac.
 
 ## [3.2.0-preview.2] - 2020-05-19
 ### Added

QAReport.md

@@ -1,18 +1,22 @@
 # Quality Report - FBX Exporter Package
-## Version tested: 2.0.4-preview
+## Version tested: 3.2.1-preview
 
-#### QA Owner: Alexis Morin
+#### QA Owner: Natalia Whiteley
 ### Tested On: Windows, MacOS
 
 ### Test strategy
 
 [Ran Test Plan](https://docs.google.com/document/d/1W_RYL6j--nASVlxwJ4QWZpiZLPseKoxP5WAooANdlNU/edit?usp=sharing)
 
 #####  New Features QA:
-- No new features
+- Tested option to preserve import settings.
+- Tested exporting an fbx outside the project.
 
 #####  Fixes QA:
-- Tested the integrations for Max and Maya work again.
+- Tested empty selection does not export in Autodesk® 3ds Max®.
+- Tested null check for bones.
+- Tested relative paths for textures in FBX files.
+- Tested fix for Editor focus lockup when creating an FBX Prefab Variant on Mac.
 
 ### Package Status
 - No new issues from current test plan or bugfixes.

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

@@ -1,6 +1,6 @@
 * [FBX Exporter](index)
 	* [Exporting FBX files](exporting)
-	* [FBX Linked Prefabs](prefabs)
+	* [FBX Prefab Variants](prefabs)
 	* [Integration](integration)
 	* [FBX Export settings](options)
 	* [FBX Recorder](recorder)

com.unity.formats.fbx/Editor/ExportModelEditorWindow.cs

@@ -376,7 +376,7 @@ protected void OnGUI ()
             ExportSettings.instance.SelectedFbxPath = EditorGUILayout.Popup (ExportSettings.instance.SelectedFbxPath, pathLabels, GUILayout.MinWidth(SelectableLabelMinWidth));
 
             // Set export setting for exporting outside the project on choosing a path
-            if (string.IsNullOrEmpty(ExportSettings.ConvertToAssetRelativePath(ExportSettings.FbxAbsoluteSavePath)))
+            if (!pathLabels[ExportSettings.instance.SelectedFbxPath].Substring(0, 6).Equals("Assets"))
             {
                 ExportSettings.instance.ExportOutsideProject = true;
             }
@@ -406,6 +406,7 @@ protected void OnGUI ()
                     // We're exporting outside Assets folder, so store the absolute path
                     else if (string.IsNullOrEmpty(relativePath))
                     {
+                        ExportSettings.instance.ExportOutsideProject = true;
                         ExportSettings.AddFbxSavePath(fullPath);
                     }
                     // Store the relative path to the Assets folder

com.unity.formats.fbx/Editor/FbxExportSettings.cs

@@ -285,7 +285,7 @@ public enum ObjectPosition { LocalCentered = 0, WorldAbsolute = 1, Reset = 2 /*
 
         public enum LODExportType { All = 0, Highest = 1, Lowest = 2 }
 
-        public bool ExportOutsideProject;
+        public bool ExportOutsideProject = false;
 
         internal const string kDefaultSavePath = ".";
         private static List<string> s_PreferenceList = new List<string>() {kMayaOptionName, kMayaLtOptionName, kMaxOptionName};

com.unity.formats.fbx/Editor/FbxExporter.cs

@@ -3704,7 +3704,7 @@ internal int ExportAll (
                 AssetDatabase.Refresh();
 
                 // replace with original metafile if specified to
-                if (ExportOptions.PreserveImportSettings && originalMetafilePath != "")
+                if (ExportOptions.PreserveImportSettings && !string.IsNullOrEmpty(originalMetafilePath))
                 {
                     ReplaceMetafile(originalMetafilePath);
                 }

com.unity.formats.fbx/Tests/FbxTests/ModelExporterTest.cs

@@ -1059,6 +1059,7 @@ public void TestPreserveImportSettings()
 
             // re-export with preserve import settings true and verify settings are the same
             var exportOptions = new ExportModelSettingsSerialize();
+            ExportSettings.instance.ExportOutsideProject = false;
             exportOptions.SetPreserveImportSettings(true);
 
             ModelExporter.ExportObjects(filename, new Object[] { cube }, exportOptions);

com.unity.formats.fbx/package.json

@@ -1,15 +1,15 @@
 {
   "name": "com.unity.formats.fbx",
   "displayName": "FBX Exporter",
-  "version": "3.2.1-preview.1",
+  "version": "3.2.1-preview.2",
   "dependencies": {
     "com.unity.recorder": "2.2.0-preview.4",
     "com.unity.timeline": "1.0.0",
     "com.autodesk.fbx": "3.1.0-preview.2"
   },
-  "unity": "2018.3",
-  "unityRelease": "4f1",
-  "description": "The Unity FBX Exporter package makes it easy to send geometry and animation from Unity 2018.3 or later to any application that supports FBX and back again with minimal effort.\n\nIn particular, this round-trip workflow enables you to export Unity scenes to FBX, import into Maya, Maya LT, or 3ds Max using an artist-friendly interface, export Unity-ready FBX geometry and animation, and safely merge your changes back into those Assets to continue your work.\n\nFor more information, see the FBX Exporter package documentation.",
+  "unity": "2018.4",
+  "unityRelease": "0f1",
+  "description": "The Unity FBX Exporter package makes it easy to send geometry and animation to any application that supports FBX and back again with minimal effort.\n\nIn particular, this round-trip workflow enables you to export Unity scenes to FBX, import into Maya, Maya LT, or 3ds Max using an artist-friendly interface, export Unity-ready FBX geometry and animation, and safely merge your changes back into those Assets to continue your work.\n\nFor more information, see the FBX Exporter package documentation.",
   "keywords": [
     "fbx",
     "animation",