Skip to content

Commit 8c50fe6

Browse files
authored
Merge pull request #40 from Unity-Technologies/Uni-21319-release
Uni-21319 update version number
2 parents 6365cde + 2e7d559 commit 8c50fe6

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

Assets/FbxExporters/Editor/FbxExporter.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,9 @@ public FbxDouble3 GetMaterialColor (Material unityMaterial, string unityPropName
308308
/// </summary>
309309
public FbxSurfaceMaterial ExportMaterial (Material unityMaterial, FbxScene fbxScene)
310310
{
311+
if (!unityMaterial)
312+
return null;
313+
311314
if (Verbose)
312315
Debug.Log (string.Format ("exporting material {0}", unityMaterial.name));
313316

@@ -455,7 +458,8 @@ meshInfo.Vertices [v].z*UnitScaleFactor
455458

456459
foreach (var mat in meshInfo.Materials) {
457460
var fbxMaterial = ExportMaterial (mat, fbxScene);
458-
fbxNode.AddMaterial (fbxMaterial);
461+
if (fbxMaterial!=null)
462+
fbxNode.AddMaterial (fbxMaterial);
459463
}
460464

461465
/*
@@ -976,7 +980,9 @@ public Material[] Materials {
976980

977981
if (FbxExporters.EditorTools.ExportSettings.instance.mayaCompatibleNames) {
978982
foreach (var mat in renderer.sharedMaterials) {
979-
mat.name = ConvertToMayaCompatibleName (mat.name);
983+
if (mat) {
984+
mat.name = ConvertToMayaCompatibleName (mat.name);
985+
}
980986
}
981987
}
982988

Assets/FbxExporters/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Copyright (c) 2017 Unity Technologies. All rights reserved.
55
Licensed under the ##LICENSENAME##.
66
See LICENSE.md file for full license information.
77

8-
**Version**: 0.0.4a
8+
**Version**: 0.0.5a
99

1010
Requirements
1111
------------

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ See LICENSE.md file in the project root for full license information.
88
Requirements
99
------------
1010

11-
* [FBX SDK C# Bindings v0.0.3a or higher](https://github.com/Unity-Technologies/FbxSharp)
11+
* [FBX SDK C# Bindings v0.0.4a or higher](https://github.com/Unity-Technologies/FbxSharp)
1212

1313
Packaging
1414
---------
@@ -20,10 +20,10 @@ Packaging
2020
git clone https://github.com/Unity-Technologies/FbxExporters.git
2121
2222
export PROJECT_PATH=~/Development/FbxExporters
23-
export UNITY3D_PATH=/Applications/Unity\ 5.6.1f1/Unity.app/Contents/MacOS/Unity
23+
export UNITY3D_PATH=/Applications/Unity\ 2017.1.0f3/Unity.app/Contents/MacOS/Unity
2424
export PACKAGE_NAME=FbxExporters
25-
export PACKAGE_VERSION=0.0.4a
26-
export FBXSDK_PACKAGE_PATH=~/Development/FbxSharp/FbxSdk_0.0.4a.unitypackage
25+
export PACKAGE_VERSION=0.0.5a
26+
export FBXSDK_PACKAGE_PATH=~/Development/FbxSharpBuild/FbxSdk_0.0.4a.unitypackage
2727
2828
"${UNITY3D_PATH}" -projectPath "${PROJECT_PATH}" -importPackage ${FBXSDK_PACKAGE_PATH} -quit
2929
"${UNITY3D_PATH}" -batchmode -projectPath "${PROJECT_PATH}" -exportPackage Assets/FbxExporters Assets/FbxSdk ${PROJECT_PATH}/${PACKAGE_NAME}_${PACKAGE_VERSION}.unitypackage -quit
@@ -38,7 +38,7 @@ git clone https://github.com/Unity-Technologies/FbxExporters.git
3838
set PROJECT_PATH=%cd%/FbxExporters
3939
set UNITY3D_PATH="C:/Program Files/Unity/Editor/Unity.exe"
4040
set PACKAGE_NAME=FbxExporters
41-
set PACKAGE_VERSION=0.0.3a
41+
set PACKAGE_VERSION=0.0.5a
4242
set FBXSDK_PACKAGE_PATH=/path/to/FbxSdk.unitypackage
4343
4444
%UNITY3D_PATH% -projectPath "%PROJECT_PATH%" -importPackage %FBXSDK_PACKAGE_PATH% -quit

0 commit comments

Comments
 (0)