Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
@@ -38,7 +38,7 @@ namespace AZ
            AZ::Vector3 GetEmissiveColor() const override;
            float GetOpacity() const override;
            float GetShininess() const override;
-            uint64_t GetUniqueId() const override;
+            AZ::u64 GetUniqueId() const override;
        };
    } // namespace FbxSDKWrapper
 } // namespace AZ