Merge pull request #301 from Unity-Technologies/UNI-37344-sprint45-release

UNI-37344 sprint 45 release

Author: vkovec

Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs

@@ -6,7 +6,6 @@
 using System.Linq;
 using System;
 using FbxExporters.Editor;
-using UnityEngine.TestTools;
 
 namespace FbxExporters
 {
@@ -235,8 +234,12 @@ public static void UpdateLinkedPrefab(GameObject prefabInstance)
 
             foreach (var fbxPrefabComponent in prefab.GetComponentsInChildren<FbxPrefab>())
             {
+                // Launch the manual update UI to allow the user to fix
+                // renamed nodes (or auto-update if there's nothing to rename).
                 var fbxPrefabUtility = new FbxPrefabUtility(fbxPrefabComponent);
-                fbxPrefabUtility.SyncPrefab();
+                ManualUpdateEditorWindow window = (ManualUpdateEditorWindow)EditorWindow.GetWindow(typeof(ManualUpdateEditorWindow));
+                window.Init(fbxPrefabUtility, fbxPrefabComponent);
+                window.Show();
             }
         }
 

CMakeLists.txt

@@ -23,7 +23,7 @@ endif()
 message(STATUS "Building for ${CMAKE_BUILD_TYPE}")
 
 if (NOT DEFINED PACKAGE_VERSION OR "${PACKAGE_VERSION}" STREQUAL "")
-    set(PACKAGE_VERSION "1.3.0a1")
+    set(PACKAGE_VERSION "sprint45")
 endif()
 message(STATUS "Using Package Version: ${PACKAGE_VERSION}")
 
@@ -188,6 +188,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
                 "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxPrefabInspector.cs"
                 "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ConvertToModel.cs"
                 "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxExporterRepairMissingScripts.cs"
+                "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ManualUpdateEditorWindow.cs"
             REFERENCES
                 "${CSHARP_MSCORLIB_LIBRARY}"
                 "${CSHARP_SYSTEM_CORE_LIBRARY}"
@@ -244,6 +245,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release")
             PATTERN "Editor/EditorRotate.cs" EXCLUDE
             PATTERN "Editor/FbxPrefabAutoUpdater.cs" EXCLUDE
             PATTERN "Editor/ConvertToModel.cs" EXCLUDE
+            PATTERN "Editor/ManualUpdateEditorWindow.cs" EXCLUDE
             PATTERN "Editor/FbxPrefabInspector.cs" EXCLUDE
             PATTERN "Editor/FbxExporterRepairMissingScripts.cs" EXCLUDE)
     install(FILES ${CLASS_LIBRARY_DEST}/${EDITOR_CLASS_LIBRARY_NAME} DESTINATION FbxExporters/Editor)

RELEASE_NOTES.md

@@ -1,5 +1,18 @@
 RELEASE NOTES
 
+**Version**: sprint45
+
+NEW FEATURES
+
+* (Alpha) FbxPrefabAutoUpdater: new UI to help manage name changes. 
+To use the UI, disable auto-update in the FbxExporter settings, then right-click on a linked prefab in the project view and select "Update from FBX"
+
+* FbxExporter: Added animation only export
+
+Use GameObject menu or context menu to select "Export Animation Only". Animation will be taken from
+Animation and Animator components. All animation clips will be saved to the same fbx.
+The first clip exported will be the default clip from the root Animator or Animation component.
+
 **Version**: 1.3.0a1
 
 FIXES