Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
@@ -18,37 +18,31 @@ namespace AZ
    {
        NodeWrapper::NodeWrapper(fbxsdk::FbxNode* fbxNode)
            :m_fbxNode(fbxNode)
-#ifdef ASSET_IMPORTER_SDK_SUPPORTED_TRAIT
            , m_assImpNode(nullptr)
-#endif
        {
        }
-#ifdef ASSET_IMPORTER_SDK_SUPPORTED_TRAIT
+
        NodeWrapper::NodeWrapper(aiNode* aiNode)
            :m_fbxNode(nullptr)
            , m_assImpNode(aiNode)
        {
        }
-#endif

        NodeWrapper::~NodeWrapper()
        {
            m_fbxNode = nullptr;
-#ifdef ASSET_IMPORTER_SDK_SUPPORTED_TRAIT
            m_assImpNode = nullptr;
-#endif
        }

        fbxsdk::FbxNode* NodeWrapper::GetFbxNode()
        {
            return m_fbxNode;
        }
-#ifdef ASSET_IMPORTER_SDK_SUPPORTED_TRAIT
+
        aiNode* NodeWrapper::GetAssImpNode()
        {
            return m_assImpNode;
        }
-#endif

        const char* NodeWrapper::GetName() const
        {