Skip to content

Commit 29a9556

Browse files
vkovecvkovec
authored
Merge pull request #336 from Unity-Technologies/UNI-40721-sprint49-release
Uni 40721 sprint49 release
2 parents 1856cf5 + 34c28df commit 29a9556

File tree

7 files changed

+47
-11
lines changed

7 files changed

+47
-11
lines changed

‎Assets/FbxExporters/Editor/ConvertToPrefabSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ public override void OnInspectorGUI ()
5757
EditorGUILayout.LabelField(new GUIContent("Transfer Root Motion To", "Select bone to transfer root motion animation to."), GUILayout.Width(LabelWidth - FieldOffset));
5858
EditorGUILayout.Popup(0, new string[]{"<None>"});
5959
GUILayout.EndHorizontal();
60+
EditorGUI.EndDisabledGroup ();
6061

6162
exportSettings.animatedSkinnedMesh = EditorGUILayout.Toggle ("Animated Skinned Mesh", exportSettings.animatedSkinnedMesh);
62-
EditorGUI.EndDisabledGroup ();
6363

6464
exportSettings.mayaCompatibleNaming = EditorGUILayout.Toggle (
6565
new GUIContent ("Compatible Naming:",

‎Assets/FbxExporters/Editor/ExportModelEditorWindow.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public abstract class ExportOptionsEditorWindow : EditorWindow
4242

4343
protected virtual void OnEnable(){
4444
InitializeReceiver ();
45+
4546
m_showOptions = true;
4647
this.minSize = new Vector2 (SelectableLabelMinWidth + LabelWidth + BrowseButtonWidth, MinWindowHeight);
4748

@@ -125,10 +126,10 @@ protected void OnGUI ()
125126

126127
GUILayout.BeginHorizontal ();
127128
GUILayout.FlexibleSpace ();
128-
if(EditorGUILayout.DropdownButton(presetIcon, FocusType.Keyboard, presetIconButton)){
129+
if (EditorGUILayout.DropdownButton (presetIcon, FocusType.Keyboard, presetIconButton)) {
129130
ShowPresetReceiver ();
130131
}
131-
GUILayout.EndHorizontal();
132+
GUILayout.EndHorizontal ();
132133

133134
EditorGUILayout.LabelField("Naming");
134135
EditorGUI.indentLevel++;

‎Assets/FbxExporters/Editor/ExportModelSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ public override void OnInspectorGUI ()
7373
EditorGUILayout.LabelField(new GUIContent("Transfer Root Motion To", "Select bone to transfer root motion animation to."), GUILayout.Width(LabelWidth - FieldOffset));
7474
EditorGUILayout.Popup(0, new string[]{"<None>"});
7575
GUILayout.EndHorizontal();
76+
EditorGUI.EndDisabledGroup ();
7677

7778
exportSettings.animatedSkinnedMesh = EditorGUILayout.Toggle ("Animated Skinned Mesh", exportSettings.animatedSkinnedMesh);
78-
EditorGUI.EndDisabledGroup ();
7979

8080
exportSettings.mayaCompatibleNaming = EditorGUILayout.Toggle (
8181
new GUIContent ("Compatible Naming:",

‎Assets/FbxExporters/Editor/FbxExporter.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ namespace Editor
6464

6565
public class ModelExporter : System.IDisposable
6666
{
67-
// To be replaced by checkbox in Fbx Export settings
68-
bool removeAnimationsFromSkinnedMeshRenderer = true;
69-
7067
const string Title =
7168
"exports static meshes with materials and textures";
7269

@@ -1810,9 +1807,9 @@ protected void ExportAnimationClip (AnimationClip uniAnimClip, GameObject uniRoo
18101807
}
18111808

18121809
// Do not create the curves if the component is a SkinnedMeshRenderer and if the option in FBX Export settings is toggled on.
1813-
if (removeAnimationsFromSkinnedMeshRenderer && (uniGO.GetComponent<SkinnedMeshRenderer>() != null || uniGO.GetComponentInChildren<SkinnedMeshRenderer>() != null))
1810+
if (!ExportOptions.AnimateSkinnedMesh && (uniGO.GetComponent<SkinnedMeshRenderer>() != null || uniGO.GetComponentInChildren<SkinnedMeshRenderer>() != null))
18141811
{
1815-
continue;
1812+
continue;
18161813
}
18171814

18181815
int index = QuaternionCurve.GetQuaternionIndex (uniCurveBinding.propertyName);

‎Assets/FbxExporters/Editor/UnitTests/Models/Cowboy/cowboyMidPoly(riged).FBX.meta

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CMakeLists.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ endif()
2323
message(STATUS "Building for ${CMAKE_BUILD_TYPE}")
2424

2525
if (NOT DEFINED PACKAGE_VERSION OR "${PACKAGE_VERSION}" STREQUAL "")
26-
set(PACKAGE_VERSION "sprint48")
26+
set(PACKAGE_VERSION "sprint49")
2727
endif()
2828
message(STATUS "Using Package Version: ${PACKAGE_VERSION}")
2929

@@ -190,6 +190,11 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
190190
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxExporterRepairMissingScripts.cs"
191191
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ManualUpdateEditorWindow.cs"
192192
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxRotationCurve.cs"
193+
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs"
194+
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ConvertToPrefabSettings.cs"
195+
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ExportModelEditorWindow.cs"
196+
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/ExportModelSettings.cs"
197+
"${CMAKE_SOURCE_DIR}/Assets/FbxExporters/Editor/FbxExportPresetSelectorReceiver.cs"
193198
REFERENCES
194199
"${CSHARP_MSCORLIB_LIBRARY}"
195200
"${CSHARP_SYSTEM_CORE_LIBRARY}"
@@ -251,7 +256,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release")
251256
PATTERN "Editor/ManualUpdateEditorWindow.cs" EXCLUDE
252257
PATTERN "Editor/FbxPrefabInspector.cs" EXCLUDE
253258
PATTERN "Editor/FbxExporterRepairMissingScripts.cs" EXCLUDE
254-
PATTERN "Editor/FbxRotationCurve.cs" EXCLUDE)
259+
PATTERN "Editor/FbxRotationCurve.cs" EXCLUDE
260+
PATTERN "Editor/ConvertToPrefabEditorWindow.cs" EXCLUDE
261+
PATTERN "Editor/ConvertToPrefabSettings.cs" EXCLUDE
262+
PATTERN "Editor/ExportModelEditorWindow.cs" EXCLUDE
263+
PATTERN "Editor/ExportModelSettings.cs" EXCLUDE
264+
PATTERN "Editor/FbxExportPresetSelectorReceiver.cs" EXCLUDE)
255265
install(FILES ${CLASS_LIBRARY_DEST}/${EDITOR_CLASS_LIBRARY_NAME} DESTINATION FbxExporters/Editor)
256266
install(FILES ${CLASS_LIBRARY_DEST}/${RUNTIME_CLASS_LIBRARY_NAME} DESTINATION FbxExporters)
257267
else()

‎RELEASE_NOTES.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
11
RELEASE NOTES
22

3+
**Version**: sprint49
4+
5+
NEW FEATURES
6+
7+
* Export Settings: Added new UI to set export settings
8+
9+
Window opens when exporting or converting to linked prefab, asking where to save the file and with what filename.
10+
Last 5 file paths used are saved.
11+
Ability to save presets for the selected options.
12+
13+
* Fbx Exporter: Added option to export model only
14+
15+
* Fbx Exporter: Added option to not export animation on skinned meshes
16+
17+
When option is checked all animation will be exported.
18+
When unchecked, animation on skinned meshes or their ancestors won't be exported
19+
20+
FIXES
21+
22+
* FbxExporter: avoid duplicate @ in filename when exporting timeline clip containing @ in the display name
23+
* FbxExporter: added validation functions for all context menu items
24+
* FbxExporter: link materials to objects connected to mesh instances
25+
26+
KNOWN ISSUES
27+
28+
* Requires Unity 2018.1.0
29+
330
**Version**: sprint48
431

532
NEW FEATURES

0 commit comments

Comments
 (0)