Merge branch 'development' into optimization/unused_files

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/IEditorImpl.cpp # Code/Editor/IEditorImpl.h # Gems/LmbrCentral/Code/Tests/lmbrcentral_editor_tests_files.cmake
2022-01-25 15:40:30 -08:00
parent 4d62351628 56e7e70735
commit 6fad254b59
871 changed files with 19489 additions and 7437 deletions
@@ -361,7 +361,6 @@ protected:
    QString m_selectFileBuffer;
    QString m_levelNameBuffer;

-    IAWSResourceManager* m_awsResourceManager;

    //! True if the editor is in material edit mode. Fast preview of materials.
    //! In this mode only very limited functionality is available.