Skip to content

Commit 3711b14

Browse files
committed
Merge branch 'master' into UNI-35582-export-anim-after-components
2 parents 74dac04 + a9821f5 commit 3711b14

File tree

6 files changed

+150
-106
lines changed

6 files changed

+150
-106
lines changed

Assets/FbxExporters/Editor/FbxExporter.cs

Lines changed: 131 additions & 88 deletions
Large diffs are not rendered by default.

Assets/FbxExporters/Editor/UnitTests/ModelExporterTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ public void TestSkinnedMeshExport(){
567567
var exportedBindposes = exportedMesh.bindposes;
568568
Assert.IsNotNull (exportedBindposes);
569569

570-
Assert.AreEqual(origBindposes.Length, exportedBindposes.Length);
570+
Assert.That(origBindposes.Length == exportedBindposes.Length);
571571

572572
for (int i = 0; i < origBindposes.Length; i++) {
573573
var origBp = origBindposes [i];

Assets/FbxExporters/UnityFbxForMax.zip.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/FbxExporters/UnityFbxForMaya.zip.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

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 "1.2.0b1")
26+
set(PACKAGE_VERSION "sprint41")
2727
endif()
2828
message(STATUS "Using Package Version: ${PACKAGE_VERSION}")
2929

RELEASE_NOTES.md

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

3+
**Version**: sprint41
4+
5+
NEW FEATURES
6+
* Added support for exporting lights
7+
* FbxExporter: added ability to export animation on transforms
8+
* FbxExporter: added ability to export animation on lights
9+
10+
Supports exporting animation of a light component's Intensity, SpotAngle, and Color
11+
12+
* FbxExporter: Added support for exporting Skinned Meshes
13+
14+
FIXES
15+
* Export Settings: Added back support for MAYA_LOCATION
16+
* Export Settings: fixed dropdown preference for Mayalt
17+
* FbxPrefabAutoUpdater: fixed so RectTransforms update correctly in Unity 2017.3
18+
* ConvertToPrefab: fixed null reference exception when converting missing components
19+
320
**Version**: 1.2.0b1
421

522
NEW FEATURES

0 commit comments

Comments
 (0)