Skip to content

Commit 5b4bc12

Browse files
authored
Merge pull request #303 from Unity-Technologies/Uni-36986-ExportRecordedAnimToFBX
Uni 36986 export recorded anim to fbx
2 parents f2aec78 + af65523 commit 5b4bc12

File tree

18 files changed

+427
-183
lines changed

18 files changed

+427
-183
lines changed

Assets/FbxExporters/Editor/FbxExporter.cs

Lines changed: 268 additions & 57 deletions
Large diffs are not rendered by default.

Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System.Collections;
21
using System.Collections.Generic;
3-
using System.Reflection;
42
using UnityEngine;
53
using UnityEditor;
64
using System.Linq;

Assets/FbxExporters/Editor/UnitTests/ExporterTestBase.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@ protected virtual string ExportSelectedObjects(string filename, params Object[]
260260
/// <param name="animOnly">If set to <c>true</c> export animation only.</param>
261261
protected string ExportToFbx (GameObject hierarchy, bool animOnly = false){
262262
string filename = GetRandomFbxFilePath ();
263-
var exportedFilePath = FbxExporters.Editor.ModelExporter.ExportObject (filename, hierarchy, animOnly);
263+
var exportedFilePath = FbxExporters.Editor.ModelExporter.ExportObject (
264+
filename, hierarchy, animOnly? FbxExporters.Editor.ModelExporter.AnimationExportType.componentAnimation : FbxExporters.Editor.ModelExporter.AnimationExportType.all
265+
);
264266
Assert.That (exportedFilePath, Is.EqualTo (filename));
265267
return filename;
266268
}

Assets/FbxSdk/LICENSE.txt

100755100644
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Autodesk FBX SDK. Copyright (c) 2016 Autodesk, Inc. All rights reserved.
2-
Use of the FBX SDK requires agreeing to and complying with the FBX SDK License and Service Agreement terms
1+
Autodesk FBX SDK. Copyright (c) 2016 Autodesk, Inc. All rights reserved.
2+
Use of the FBX SDK requires agreeing to and complying with the FBX SDK License and Service Agreement terms
33
accessed at https://damassets.autodesk.net/content/dam/autodesk/www/Company/docs/pdf/legal-notices-&-trademarks/Autodesk_FBX_SDK_2015_License_and_Services_Agreement.pdf"

Assets/FbxSdk/Plugins.meta

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

Assets/FbxSdk/Plugins/UnityFbxSdk.dll

100755100644
File mode changed.

Assets/FbxSdk/Plugins/x64.meta

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

Assets/FbxSdk/Plugins/x64/MacOS.meta

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

Assets/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle.meta

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

Assets/FbxSdk/Plugins/x64/MacOS/UnityFbxSdkNative.bundle/Contents.meta

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

0 commit comments

Comments
 (0)