Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -211,7 +211,6 @@ public:
    MOCK_METHOD0(UnloadPlugins, void());
    MOCK_METHOD0(LoadPlugins, void());
    MOCK_CONST_METHOD0(IsNewViewportInteractionModelEnabled, bool());
-    MOCK_CONST_METHOD0(IsPrefabSystemEnabled, bool());
    MOCK_METHOD1(GetSearchPath, QString(EEditorPathName));
    MOCK_METHOD0(GetEditorPanelUtils, IEditorPanelUtils* ());