Integrating latest 47acbe8

This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
+2 -8
View File
@@ -15,9 +15,9 @@ namespace fbxsdk
{
class FbxNode;
}
#ifdef ASSET_IMPORTER_SDK_SUPPORTED_TRAIT
struct aiNode;
#endif
namespace AZ
{
namespace SDKNode
@@ -29,9 +29,7 @@ namespace AZ
NodeWrapper() = default;
NodeWrapper(fbxsdk::FbxNode* fbxNode);
#ifdef ASSET_IMPORTER_SDK_SUPPORTED_TRAIT
NodeWrapper(aiNode* aiNode);
#endif
virtual ~NodeWrapper();
enum CurveNodeComponent
@@ -42,9 +40,7 @@ namespace AZ
};
fbxsdk::FbxNode* GetFbxNode();
#ifdef ASSET_IMPORTER_SDK_SUPPORTED_TRAIT
aiNode* GetAssImpNode();
#endif
virtual const char* GetName() const;
virtual AZ::u64 GetUniqueId() const;
@@ -55,9 +51,7 @@ namespace AZ
fbxsdk::FbxNode* m_fbxNode = nullptr;
#ifdef ASSET_IMPORTER_SDK_SUPPORTED_TRAIT
aiNode* m_assImpNode = nullptr;
#endif
};
} //namespace Node
} //namespace AZ