Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux

2021-11-04 15:58:44 -07:00
parent ea5eba6e3f 2853c4d0dc
commit 0175e9d3cb
337 changed files with 8195 additions and 4099 deletions
@@ -89,7 +89,7 @@ namespace GraphCanvas
        explicit AssetEditorMainWindow(AssetEditorWindowConfig* config, QWidget* parent = nullptr);
        virtual ~AssetEditorMainWindow();
        
-        virtual void SetupUI();
+        void SetupUI();
        void SetDropAreaText(AZStd::string_view text);        

        const EditorId& GetEditorId() const;