Skip to content

Commit d7331b6

Browse files
author
Mark Visser
committed
removed all platforms but Editor from asmdef files since FBX SDK won't build under IL2CPP
updated package.json to point at new com.autodesk.fbx.sdk-2.0.0-preview.6 (same issue fixed) updated package.json to use Timeline 1.0.0 instead of 0.0.0-builtin added Assets/.gitignore to TestProjects/FbxTests to prevent folder removal
1 parent a9eac3f commit d7331b6

File tree

6 files changed

+36
-12
lines changed

6 files changed

+36
-12
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changes in Fbx Exporter
22

3+
## [2.0.1-preview.5] - 2019-02-01
4+
CHANGES
5+
* Updated to com.autodesk.fbx 2.0.0-preview.6
6+
* Updated asmdefs to only include Editor platform
7+
38
## [2.0.1-preview.4] - 2019-01-31
49
CHANGES
510
* Updated unityRelease version in package.json

TestProjects/FbxTests/Assets/.gitignore

Whitespace-only changes.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.2.0a1
2-
m_EditorVersionWithRevision: 2019.2.0a1 (f415bc2e1f10)
1+
m_EditorVersion: 2019.1.0b1
2+
m_EditorVersionWithRevision: 2019.1.0b1 (83b3ba1f99df)
Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
{
22
"name": "Unity.Formats.Fbx.Editor",
33
"references": [
4-
"Unity.Timeline",
5-
"Unity.Timeline.Editor",
6-
"Unity.Formats.Fbx.Runtime",
7-
"Autodesk.Fbx"
4+
"Unity.Timeline",
5+
"Unity.Timeline.Editor",
6+
"Unity.Formats.Fbx.Runtime",
7+
"Autodesk.Fbx"
88
],
9+
"optionalUnityReferences": [],
910
"includePlatforms": [
1011
"Editor"
1112
],
12-
"excludePlatforms": []
13-
}
13+
"excludePlatforms": [],
14+
"allowUnsafeCode": false,
15+
"overrideReferences": false,
16+
"precompiledReferences": [],
17+
"autoReferenced": true,
18+
"defineConstraints": [],
19+
"versionDefines": []
20+
}
Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
11
{
2-
"name": "Unity.Formats.Fbx.Runtime"
3-
}
2+
"name": "Unity.Formats.Fbx.Runtime",
3+
"references": [],
4+
"optionalUnityReferences": [],
5+
"includePlatforms": [
6+
"Editor"
7+
],
8+
"excludePlatforms": [],
9+
"allowUnsafeCode": false,
10+
"overrideReferences": false,
11+
"precompiledReferences": [],
12+
"autoReferenced": true,
13+
"defineConstraints": [],
14+
"versionDefines": []
15+
}

proto.com.unity.formats.fbx/package.json.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"displayName": "FBX Exporter",
44
"version": "@PACKAGE_VERSION@",
55
"dependencies": {
6-
"com.unity.timeline": "0.0.0-builtin",
7-
"com.autodesk.fbx": "2.0.0-preview.5"
6+
"com.unity.timeline": "1.0.0",
7+
"com.autodesk.fbx": "2.0.0-preview.6"
88
},
99
"unity": "2018.3",
1010
"unityRelease": "4f1",

0 commit comments

Comments
 (0)