Merge pull request #1128 from simonferquel/master

[Fbx exporter] Bug fix for scenes with no material

.gitignore

@@ -44,6 +44,8 @@ ipch/
 *.ncb
 *.opensdf
 *.sdf
+*.VC.db
+*.VC.opendb
 
 # Visual Studio profiler
 *.psess

Exporters/FBX/3rdParty/Fbx2016.1/include/fbxsdk/core/base/fbxarray.h

@@ -283,6 +283,8 @@ public:
 	* \return \c true if successful, otherwise \c false. */
 	inline void RemoveRange(const int pIndex, const int pCount)
 	{
+		FBX_ASSERT_RETURN(pIndex >= 0);
+		FBX_ASSERT_RETURN(pCount >= 0);
 		if( pIndex + pCount < mSize )
 		{
 			memmove(&mArray[pIndex], &mArray[pIndex + pCount], (mSize - pIndex - pCount) * sizeof(T));

Exporters/FBX/3rdParty/Fbx2016.1/include/fbxsdk/core/base/fbxutils.h

@@ -35,8 +35,12 @@
 FBXSDK_DLL FbxString FbxGetSystemTempPath();
 
 /** Override the system temporary folder path name.
-* \param pPathUTF8 The system temporary folder to use for override. */
-FBXSDK_DLL void FbxSetSystemTempPath(const char* pPathUTF8);
+  * \param pPathUTF8 The system temporary folder to use for override.
+  * \return True if the system temporary folder path has been set and False otherwise.
+  * \remark The system temporary folder is limited to _MAX_PATH characters. Trying to set
+  * a longer value will fail and the current system temporary folder path is left unchanged.
+  */
+FBXSDK_DLL bool FbxSetSystemTempPath(const char* pPathUTF8);
 
 /** Retrieve the working directory of the system in UTF8 format.
 * \return A string that contain the current working directory of the system. */

Exporters/FBX/3rdParty/Fbx2016.1/include/fbxsdk/core/fbxobject.h

@@ -161,12 +161,6 @@ class FBXSDK_DLL FbxObject : public FbxEmitter
 public:
 	//! \name General Object Management
 	//@{
-		/** Test if this class is a hierarchical children of the specified class type. This is the standard method to differentiate object classes. (Deprecated, please use Is<Type>() instead.)
-		* \param pClassId The class type to test against self.
-		* \return \c true if the object is a hierarchical children of the type specified.
-		* \remark This function will perform a complete search until it reaches the top level class, but it will stop as soon as one ClassId matches the test. */
-		FBX_DEPRECATED inline bool Is(const FbxClassId& pClassId) const { return GetClassId().Is(pClassId); }
-
 		/** Templated test if this class is a hierarchical children of the specified class type.
 		* \return \c true if the object is a hierarchical children of the type specified.
 		* \remark This function will perform a complete search until it reaches the top level class, but it will stop as soon as one ClassId matches the test. */
@@ -450,12 +444,6 @@ public:
 		  */
 		inline bool DisconnectAllSrcObject(const FbxCriteria& pCriteria) { return RootProperty.DisconnectAllSrcObject(pCriteria); }
 
-		/** Disconnects this object from all source objects of a specific class type. (Deprecated, please use DisconnectAllSrcObject<Type>() instead.)
-		  * \param pClassId The specific class type.
-		  * \return \c True if it disconnects all source objects successfully, \c false otherwise.
-		  */
-		FBX_DEPRECATED inline bool DisconnectAllSrcObject(FbxClassId pClassId) { return RootProperty.DisconnectAllSrcObject(FbxCriteria::ObjectType(pClassId)); }
-
 		/** Returns the number of source objects with which this object connects.
 		  * \return The number of source objects with which this object connects. 
 		  */
@@ -467,12 +455,6 @@ public:
 		  */
 		inline int GetSrcObjectCount(const FbxCriteria& pCriteria) const { return RootProperty.GetSrcObjectCount(pCriteria); }
 
-		/** Returns the number of source objects of the specific class type with which this object connects. (Deprecated, please use GetSrcObjectCount<Type>() instead.)
-		  * \param pClassId The specific class type.
-		  * \return The number of source objects of the specific class type with which this object connects.
-		  */
-		FBX_DEPRECATED inline int GetSrcObjectCount(FbxClassId pClassId) const { return RootProperty.GetSrcObjectCount(FbxCriteria::ObjectType(pClassId)); }
-
 		/** Returns the source object with which this object connects at the specified index.
 		  * \param pIndex The specified index whose default value is 0.
 		  * \return The source object at the specified index, NULL if not found.
@@ -486,13 +468,6 @@ public:
 		  */
 		inline FbxObject* GetSrcObject(const FbxCriteria& pCriteria, int pIndex=0) const { return RootProperty.GetSrcObject(pCriteria,pIndex); }
 
-		/** Returns the source object of the specified class type at the specified index with which this object connects. (Deprecated, please use GetSrcObject<Type>() instead.)
-		  * \param pClassId The specified class type.
-		  * \param pIndex The specified index whose default value is 0.
-		  * \return The source object of the specified class type at the specified index, NULL if not found.
-		  */
-		FBX_DEPRECATED inline FbxObject* GetSrcObject(FbxClassId pClassId, int pIndex=0) const { return RootProperty.GetSrcObject(FbxCriteria::ObjectType(pClassId), pIndex); }
-
 		/** Searches the source object with the specified name, starting at the specified index.
 		  * \param pName The object name.
 		  * \param pStartIndex The start index.
@@ -508,14 +483,6 @@ public:
 		  */
 		inline FbxObject* FindSrcObject(const FbxCriteria& pCriteria, const char* pName, int pStartIndex=0) const { return RootProperty.FindSrcObject(pCriteria,pName,pStartIndex); }
 
-		/** Searches the source object with the specified name which is also the specified class type, starting at the specified index. (Deprecated, please use FindSrcObject<Type>() instead.)
-		  * \param pClassId The specified class type.
-		  * \param pName The object name.
-		  * \param pStartIndex The start index.
-		  * \return The source object with the name, NULL if not found.
-		  */
-		FBX_DEPRECATED inline FbxObject* FindSrcObject(FbxClassId pClassId, const char* pName, int pStartIndex=0) const { return RootProperty.FindSrcObject(FbxCriteria::ObjectType(pClassId), pName, pStartIndex); }
-
 		/** Disconnects this object from all source objects of the specified class type.
 		* \return \c true if it disconnects all source objects successfully, \c false otherwise. */
 		template <class T> inline bool DisconnectAllSrcObject() { return RootProperty.DisconnectAllSrcObject(FbxCriteria::ObjectType(T::ClassId)); }
@@ -588,12 +555,6 @@ public:
 		  */
 		inline bool DisconnectAllDstObject(const FbxCriteria& pCriteria) { return RootProperty.DisconnectAllDstObject(pCriteria); }
 
-		/** Disconnects this object from all destination objects of the specified class type. (Deprecated, please use DisconnectAllDstObject<Type>() instead.)
-		  * \param pClassId The specified class type.
-		  * \return \c True if it disconnects all destination objects of the specified class type successfully, \c false otherwise.
-		  */
-		FBX_DEPRECATED inline bool DisconnectAllDstObject(FbxClassId pClassId) { return RootProperty.DisconnectAllDstObject(FbxCriteria::ObjectType(pClassId)); }
-
 		/** Returns the number of destination objects with which this object connects. 
 		  * \return The number of destination objects with which this object connects. 
 		  */
@@ -605,12 +566,6 @@ public:
 		  */
 		inline int GetDstObjectCount(const FbxCriteria& pCriteria) const { return RootProperty.GetDstObjectCount(pCriteria); }
 
-		/** Returns the number of destination objects of the specified class type with which this object connects. (Deprecated, please use GetDstObjectCount<Type>() instead.)
-		  * \param pClassId The specified class type.
-		  * \return The number of destination objects of the specified class type with which this object connects. 
-		  */
-		FBX_DEPRECATED inline int GetDstObjectCount(FbxClassId pClassId) const { return RootProperty.GetDstObjectCount(FbxCriteria::ObjectType(pClassId)); }
-
 		/** Returns the destination object at the specified index with which this object connects.
 		  * \param pIndex The specified index whose default value is 0.
 		  * \return The destination object at the specified index, NULL if not found.
@@ -624,13 +579,6 @@ public:
 		  */
 		inline FbxObject* GetDstObject(const FbxCriteria& pCriteria, int pIndex=0) const { return RootProperty.GetDstObject(pCriteria,pIndex); }
 
-		/** Returns the destination object of the specified class type with which this object connects at the specified index. (Deprecated, please use GetDstObject<Type>() instead.)
-		  * \param pClassId The specified class type.
-		  * \param pIndex The specified index whose default value is 0.
-		  * \return The destination object of the specified class type at the specified index, NULL if not found.
-		  */
-		FBX_DEPRECATED inline FbxObject* GetDstObject(FbxClassId pClassId, int pIndex=0) const { return RootProperty.GetDstObject(FbxCriteria::ObjectType(pClassId), pIndex); }
-
 		/** Searches the destination object with the specified name, starting at the specified index.
 		  * \param pName The object name.
 		  * \param pStartIndex The start index.
@@ -646,14 +594,6 @@ public:
 		  */
 		inline FbxObject* FindDstObject(const FbxCriteria& pCriteria, const char* pName, int pStartIndex=0) const { return RootProperty.FindDstObject(pCriteria,pName,pStartIndex); }
 
-		/** Searches the destination object with the specified name which is the specified class type, starting at the specified index. (Deprecated, please use FindDstObject<Type>() instead.)
-		  * \param pClassId The specified class type.
-		  * \param pName The object name.
-		  * \param pStartIndex The start index.
-		  * \return The destination object with the name, NULL if not found.
-		  */
-		FBX_DEPRECATED inline FbxObject* FindDstObject(FbxClassId pClassId, const char* pName,int pStartIndex=0) const { return RootProperty.FindDstObject(FbxCriteria::ObjectType(pClassId), pName, pStartIndex); }
-
 		/** Disconnects this object from all destination objects of the specified class type.
 		* \return \c true if it disconnects all destination objects of the specified class type successfully, \c false otherwise. */
 		template <class T> inline bool DisconnectAllDstObject() { return RootProperty.DisconnectAllDstObject(FbxCriteria::ObjectType(T::ClassId)); }

Exporters/FBX/3rdParty/Fbx2016.1/include/fbxsdk/core/fbxproperty.h

@@ -703,12 +703,6 @@ public:
 		  */
 		bool DisconnectAllSrcObject(const FbxCriteria& pCriteria);
 
-		/** Disconnects this property from all the source objects of a specific class type. (Deprecated, please use DisconnectAllSrcObject<Type>() instead.)
-		  * \param pClassId The specific class type.
-		  * \return \c True if it disconnects all the source objects successfully, \c false otherwise.
-		  */
-		FBX_DEPRECATED bool DisconnectAllSrcObject(const FbxClassId& pClassId);
-
 		/** Returns the number of source objects with which this property connects.
 		  * \return The number of source objects with which this property connects. 
 		  */
@@ -720,12 +714,6 @@ public:
 		  */
 		int GetSrcObjectCount(const FbxCriteria& pCriteria) const;
 
-		/** Returns the number of source objects of the specific class type with which this property connects. (Deprecated, please use GetSrcObjectCount<Type>() instead.)
-		  * \param pClassId The specific class type.
-		  * \return The number of source objects of the specific class type with which this property connects.
-		  */
-		FBX_DEPRECATED int GetSrcObjectCount(const FbxClassId& pClassId) const;
-
 		/** Returns the source object at the specified index with which this property connects.
 		  * \param pIndex The specified index whose default value is 0.
 		  * \return The source object at the specified index, NULL if not found.
@@ -739,13 +727,6 @@ public:
 		  */
 		FbxObject* GetSrcObject(const FbxCriteria& pCriteria, const int pIndex=0) const;
 
-		/** Returns the source object of the specified class type at the specified index with which this property connects. (Deprecated, please use GetSrcObject<Type>() instead.)
-		  * \param pClassId The specified class type.
-		  * \param pIndex The specified index whose default value is 0.
-		  * \return The source object of the specified class type at the specified index, NULL if not found.
-		  */
-		FBX_DEPRECATED FbxObject* GetSrcObject(const FbxClassId& pClassId, const int pIndex=0) const;
-
 		/** Searches the source object with the specified name, starting with the specified index.
 		  * \param pName The object name.
 		  * \param pStartIndex The start index.
@@ -761,14 +742,6 @@ public:
 		  */
 		FbxObject* FindSrcObject(const FbxCriteria& pCriteria, const char* pName, const int pStartIndex=0) const;
 
-		/** Searches the source object with the specified name which is of the specified class type, starting with the specified index. (Deprecated, please use FindSrcObject<Type>() instead.)
-		  * \param pClassId The specified class type.
-		  * \param pName The object name.
-		  * \param pStartIndex The start index.
-		  * \return The source object with the name, NULL if not found.
-		  */
-		FBX_DEPRECATED FbxObject* FindSrcObject(const FbxClassId& pClassId, const char* pName, const int pStartIndex=0) const;
-
 		/** Disconnects this property from all source objects of the specified class type.
 		  * \tparam T The specified class type.
 		  * \return \c True if it disconnects all source objects successfully, \c false otherwise.
@@ -857,12 +830,6 @@ public:
 		  */
 		bool DisconnectAllDstObject(const FbxCriteria& pCriteria);
 
-		/** Disconnects this property from all the destination objects of the specified class type. (Deprecated, please use DisconnectAllDstObject<Type>() instead.)
-		  * \param pClassId The specified class type.
-		  * \return \c True if it disconnects all the destination objects successfully, \c false otherwise.
-		  */
-		FBX_DEPRECATED bool DisconnectAllDstObject(const FbxClassId& pClassId);
-
 		/** Returns the number of destination objects with which this property connects. 
 		  * \return The number of destination objects with which this property connects. 
 		  */
@@ -874,12 +841,6 @@ public:
 		  */
 		int GetDstObjectCount(const FbxCriteria& pCriteria) const;
 
-		/** Returns the number of destination objects of the specified class type with which this property connects. (Deprecated, please use GetDstObjectCount<Type>() instead.)
-		  * \param pClassId The specified class type.
-		  * \return The number of destination objects of the specified class type with which this property connects. 
-		  */
-		FBX_DEPRECATED int GetDstObjectCount(const FbxClassId& pClassId) const;
-
 		/** Returns the destination object at the specified index with which this property connects.
 		  * \param pIndex The specified index whose default value is 0.
 		  * \return The destination object at the specified index, NULL if not found.
@@ -893,13 +854,6 @@ public:
 		  */
 		FbxObject* GetDstObject(const FbxCriteria& pCriteria, const int pIndex=0) const;
 
-		/** Returns the destination object of the specified class type at the specified index with which this property connects. (Deprecated, please use GetDstObject<Type>() instead.)
-		  * \param pClassId The specified class type.
-		  * \param pIndex The specified index whose default value is 0.
-		  * \return The destination object of the specified class type at the specified index, NULL if not found.
-		  */
-		FBX_DEPRECATED FbxObject* GetDstObject(const FbxClassId& pClassId, const int pIndex=0) const;
-
 		/** Searches the destination object with the specified name, starting with the specified index.
 		  * \param pName The object name.
 		  * \param pStartIndex The start index.
@@ -915,14 +869,6 @@ public:
 		  */
 		FbxObject* FindDstObject(const FbxCriteria& pCriteria, const char* pName, const int pStartIndex=0) const;
 
-		/** Searches the destination object with the specified name which is of the specified class type, starting with the specified index. (Deprecated, please use FindDstObject<Type>() instead.)
-		  * \param pClassId The specified class type.
-		  * \param pName The object name.
-		  * \param pStartIndex The start index.
-		  * \return The destination object with the name, NULL if not found.
-		  */
-		FBX_DEPRECATED FbxObject* FindDstObject(const FbxClassId& pClassId, const char* pName, const int pStartIndex=0) const;
-
 		/** Disconnects this property from all the destination objects of the specified class type.
 		  * \tparam T The specified class type.
 		  * \return \c True if it disconnects all the destination objects successfully, \c false otherwise.

Exporters/FBX/3rdParty/Fbx2016.1/include/fbxsdk/fbxsdk_version.h

@@ -20,14 +20,14 @@
 #define _FBXSDK_VERSION_H_
 
 //FBX SDK version defines
-#define FBXSDK_VERSION_MAJOR	2016		//<! Integer, version major number
-#define FBXSDK_VERSION_MINOR	1			//<! Integer, version minor number
-#define FBXSDK_VERSION_POINT	0			//<! Integer, version point number
+#define FBXSDK_VERSION_MAJOR	2017		//<! Integer, version major number
+#define FBXSDK_VERSION_MINOR	0			//<! Integer, version minor number
+#define FBXSDK_VERSION_POINT	1			//<! Integer, version point number
 #define FBXSDK_VERSION_NAME		"Release"	//<! String, version name, example: Alpha, Beta, RC, Release
 
-#define FBXSDK_VERSION_YEAR     2015		//<! Integer, release date year
-#define FBXSDK_VERSION_MONTH	06			//<! Integer, release date month
-#define FBXSDK_VERSION_DAY		30			//<! Integer, release date day
+#define FBXSDK_VERSION_YEAR     2016		//<! Integer, release date year
+#define FBXSDK_VERSION_MONTH	04			//<! Integer, release date month
+#define FBXSDK_VERSION_DAY		14			//<! Integer, release date day
 
 #ifndef FBXSDK_VERSION_REVISION
 	#define FBXSDK_VERSION_REVISION	0		//<! Integer, version revision number, set by build environment. Do not edit here!

Exporters/FBX/3rdParty/Fbx2016.1/include/fbxsdk/fileio/fbx/fbxwriterfbx6.h

@@ -298,6 +298,7 @@ private:
     FbxArray<ModifiedPropertyInfo*> mModifiedProperties;
     void ReplaceUnsupportedProperties(FbxScene* pScene, bool pPreprocessPass, int pFormatV);
 	void StoreUnsupportedProperty(FbxObject* pObject, FbxProperty& pProperty);
+    bool IsLeafRoll(const FbxString& pNameWithoutNameSpacePrefix);
 
     FbxProgress* mProgress;
     bool mProgressPause;