merging latest origin

2021-05-03 21:27:27 -07:00
parent d5ad5d9596 edf8ab4822
commit d0a561fa01
4864 changed files with 37281 additions and 612775 deletions
@@ -42,6 +42,7 @@ namespace UnitTest

        MOCK_METHOD3(InstantiateDynamicSlice, AzFramework::SliceInstantiationTicket(const AZ::Data::Asset<AZ::Data::AssetData>&, const AZ::Transform&, const AZ::IdUtils::Remapper<AZ::EntityId>::IdMapper&));
        MOCK_METHOD0(GetGameEntityContextId, AzFramework::EntityContextId());
+        MOCK_METHOD0(GetGameEntityContextInstance, AzFramework::EntityContext*());
        MOCK_METHOD1(CreateGameEntity, AZ::Entity*(const char*));
        MOCK_METHOD1(AddGameEntity, void (AZ::Entity*));
        MOCK_METHOD1(DestroyGameEntity, void (const AZ::EntityId&));