Merge branch 'development' into cmake/linux_fix_warn_unused

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/Objects/TrackGizmo.cpp
2021-08-25 14:50:05 -07:00
parent 058f6e0f22 45b2336dce
commit f20d17398c
113 changed files with 380 additions and 14845 deletions
@@ -624,8 +624,6 @@ struct SSystemGlobalEnvironment
    ISystem*                   pSystem = nullptr;
    ILog*                      pLog;
    IMovieSystem*              pMovieSystem;
-    INameTable*                pNameTable;
-    IRenderer*                 pRenderer;
    ILyShine*                      pLyShine;
    SharedEnvironmentInstance*      pSharedEnvironment;

@@ -852,7 +850,6 @@ struct ISystem
    //
    virtual IViewSystem* GetIViewSystem() = 0;
    virtual ILevelSystem* GetILevelSystem() = 0;
-    virtual INameTable* GetINameTable() = 0;
    virtual ICmdLine* GetICmdLine() = 0;
    virtual ILog* GetILog() = 0;
    virtual AZ::IO::IArchive* GetIPak() = 0;