Merge branch 'master' into Uni-41549-RemovePresetForUnity2017

# Conflicts:
#	Assets/FbxExporters/Editor/ExportModelEditorWindow.cs

Author: MarcShakour

Assets/FbxExporters/Editor/ConvertToPrefabSettings.cs

@@ -57,9 +57,9 @@ public override void OnInspectorGUI ()
             EditorGUILayout.LabelField(new GUIContent("Transfer Root Motion To", "Select bone to transfer root motion animation to."), GUILayout.Width(LabelWidth - FieldOffset));
             EditorGUILayout.Popup(0, new string[]{"<None>"});
             GUILayout.EndHorizontal();
+            EditorGUI.EndDisabledGroup ();
 
             exportSettings.animatedSkinnedMesh = EditorGUILayout.Toggle ("Animated Skinned Mesh", exportSettings.animatedSkinnedMesh);
-            EditorGUI.EndDisabledGroup ();
 
             exportSettings.mayaCompatibleNaming = EditorGUILayout.Toggle (
                 new GUIContent ("Compatible Naming:",

Assets/FbxExporters/Editor/ExportModelSettings.cs

@@ -73,9 +73,9 @@ public override void OnInspectorGUI ()
             EditorGUILayout.LabelField(new GUIContent("Transfer Root Motion To", "Select bone to transfer root motion animation to."), GUILayout.Width(LabelWidth - FieldOffset));
             EditorGUILayout.Popup(0, new string[]{"<None>"});
             GUILayout.EndHorizontal();
+            EditorGUI.EndDisabledGroup ();
 
             exportSettings.animatedSkinnedMesh = EditorGUILayout.Toggle ("Animated Skinned Mesh", exportSettings.animatedSkinnedMesh);
-            EditorGUI.EndDisabledGroup ();
 
             exportSettings.mayaCompatibleNaming = EditorGUILayout.Toggle (
                 new GUIContent ("Compatible Naming:",

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -64,9 +64,6 @@ namespace Editor
 
         public class ModelExporter : System.IDisposable
         {
-            // To be replaced by checkbox in Fbx Export settings
-            bool removeAnimationsFromSkinnedMeshRenderer = true;
-
             const string Title =
                 "exports static meshes with materials and textures";
 
@@ -1810,9 +1807,9 @@ protected void ExportAnimationClip (AnimationClip uniAnimClip, GameObject uniRoo
                     }
 
                     // Do not create the curves if the component is a SkinnedMeshRenderer and if the option in FBX Export settings is toggled on.
-                    if (removeAnimationsFromSkinnedMeshRenderer && (uniGO.GetComponent<SkinnedMeshRenderer>() != null || uniGO.GetComponentInChildren<SkinnedMeshRenderer>() != null)) 
+                    if (!ExportOptions.AnimateSkinnedMesh && (uniGO.GetComponent<SkinnedMeshRenderer>() != null || uniGO.GetComponentInChildren<SkinnedMeshRenderer>() != null)) 
                     {
-                        continue;    
+                        continue;
                     }
 
                     int index = QuaternionCurve.GetQuaternionIndex (uniCurveBinding.propertyName);

Assets/FbxExporters/Editor/UnitTests/ExportTimelineClipTest.cs.meta

@@ -23,7 +23,7 @@ endif()
 message(STATUS "Building for ${CMAKE_BUILD_TYPE}")
 
 if (NOT DEFINED PACKAGE_VERSION OR "${PACKAGE_VERSION}" STREQUAL "")
-    set(PACKAGE_VERSION "sprint48")
+    set(PACKAGE_VERSION "sprint49")
 endif()
 message(STATUS "Using Package Version: ${PACKAGE_VERSION}")
 
@@ -190,6 +190,11 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
                 "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxExporterRepairMissingScripts.cs"
                 "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ManualUpdateEditorWindow.cs"
                 "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxRotationCurve.cs"
+                "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs"
+                "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ConvertToPrefabSettings.cs"
+                "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ExportModelEditorWindow.cs"
+                "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ExportModelSettings.cs"
+                "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxExportPresetSelectorReceiver.cs"
             REFERENCES
                 "${CSHARP_MSCORLIB_LIBRARY}"
                 "${CSHARP_SYSTEM_CORE_LIBRARY}"
@@ -251,7 +256,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release")
             PATTERN "Editor/ManualUpdateEditorWindow.cs" EXCLUDE
             PATTERN "Editor/FbxPrefabInspector.cs" EXCLUDE
             PATTERN "Editor/FbxExporterRepairMissingScripts.cs" EXCLUDE
-            PATTERN "Editor/FbxRotationCurve.cs" EXCLUDE)
+            PATTERN "Editor/FbxRotationCurve.cs" EXCLUDE
+            PATTERN "Editor/ConvertToPrefabEditorWindow.cs" EXCLUDE
+            PATTERN "Editor/ConvertToPrefabSettings.cs" EXCLUDE
+            PATTERN "Editor/ExportModelEditorWindow.cs" EXCLUDE
+            PATTERN "Editor/ExportModelSettings.cs" EXCLUDE
+            PATTERN "Editor/FbxExportPresetSelectorReceiver.cs" EXCLUDE)
     install(FILES ${CLASS_LIBRARY_DEST}/${EDITOR_CLASS_LIBRARY_NAME} DESTINATION FbxExporters/Editor)
     install(FILES ${CLASS_LIBRARY_DEST}/${RUNTIME_CLASS_LIBRARY_NAME} DESTINATION FbxExporters)
 else()