Skip to content

Commit b7895c3

Browse files
authored
Merge pull request #355 from Unity-Technologies/UNI-41724-sprint50-release
Uni 41724 sprint50 release
2 parents 067acc5 + 217a65e commit b7895c3

File tree

3 files changed

+33
-6
lines changed

3 files changed

+33
-6
lines changed

Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,6 @@ protected override bool Export ()
100100
var prefabDirPath = ExportSettings.GetPrefabAbsoluteSavePath ();
101101
var prefabPath = System.IO.Path.Combine (prefabDirPath, m_prefabFileName + ".prefab");
102102

103-
// check if file already exists, give a warning if it does
104-
if (!OverwriteExistingFile (fbxPath) || !OverwriteExistingFile (prefabPath)) {
105-
return false;
106-
}
107-
108103
if (ToExport == null) {
109104
Debug.LogError ("FbxExporter: missing object for conversion");
110105
return false;

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
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 "sprint49")
26+
set(PACKAGE_VERSION "sprint50")
2727
endif()
2828
message(STATUS "Using Package Version: ${PACKAGE_VERSION}")
2929

RELEASE_NOTES.md

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

3+
**Version**: sprint50
4+
5+
NEW FEATURES
6+
7+
* Fbx Exporter: remove "Export All Timeline Clips" menu option
8+
9+
* Fbx Export Settings: Added option to transfer transform animation on export
10+
11+
Ability to select source and destination transforms to transfer animation from and to respectively.
12+
Destination must be a descendant of source.
13+
All animation on transforms on and between source and destination will be combined and transferred to destination.
14+
15+
* Maya Integration: Added option to export both model and animation to same file
16+
17+
File exported to will be the same as "Export Model Only"
18+
19+
FIXES
20+
21+
* FbxExporterTests: fix Export Timeline Clip unit tests (add back missing scene)
22+
* FbxExporter: don't export animation on objects (e.g. LODs) that don't get exported
23+
* FbxExportSettings: remove presets so package works in Unity 2017
24+
* FbxExportSettings: fix so min dialog size doesn't cut off export button
25+
* FbxExporter: rename Export Model to Export To FBX
26+
* FbxExportSettings: fix console error on Mac when clicking "Install Unity Integration"
27+
* FbxExportSettings: turn animated skinned mesh export off by default
28+
* FbxExportSettings: export animation on skinned mesh ancestors even if animated skinned mesh option is off
29+
* FbxExporter: fix error when trying to export animation only on model without animation
30+
* ConvertToPrefabUI: don't give warning about overwriting fbx if GameObject was model instance
31+
* FbxExportSettings: give error if empty filename specified
32+
* ExportModelUI: restore "Include" setting from "Animation Only" after exporting timeline clip
33+
* FbxExporter: if export unrendered turned off, don't export meshes that have disabled mesh renderers
34+
335
**Version**: sprint49
436

537
NEW FEATURES

0 commit comments

Comments
 (0)