Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -27,6 +27,7 @@ namespace AZ::SceneAPI::DataTypes
        MOCK_CONST_METHOD1(GetUsedPointIndexForControlPoint, int(int));
        MOCK_CONST_METHOD0(GetVertexCount, unsigned int());
        MOCK_CONST_METHOD0(GetFaceCount, unsigned int());
+        MOCK_CONST_METHOD1(GetFaceInfo, const Face&(unsigned int index));
        MOCK_CONST_METHOD1(GetPosition, const AZ::Vector3&(unsigned int index));
        MOCK_CONST_METHOD1(GetNormal, const AZ::Vector3&(unsigned int index));
        MOCK_CONST_METHOD2(GetFaceVertexIndex, unsigned int(unsigned int face, unsigned int vertexIndex));
@@ -36,6 +36,8 @@ namespace AZ
                {}
                ~MockIGraphObject() override = default;

+                void CloneAttributesFrom([[maybe_unused]] const IGraphObject* sourceObject) override {}
+
                int m_id;
            };

@@ -54,6 +56,8 @@ namespace AZ
                {}
                ~MockIGraphObjectAlt() override = default;

+                void CloneAttributesFrom([[maybe_unused]] const IGraphObject* sourceObject) override {}
+
                int m_id;
            };