Merged main in

2021-05-04 10:13:50 -05:00
parent 03c219bd2d 70bd3ea0ff
commit 4c47d7b587
427 changed files with 9465 additions and 26529 deletions
@@ -93,13 +93,11 @@ AZ_POP_DISABLE_WARNING
 #include "TimeOfDayDialog.h"

 #include "Dialogs/PythonScriptsDialog.h"
-#include "Material/MaterialManager.h"
 #include "EngineSettingsManager.h"

 #include "AzAssetBrowser/AzAssetBrowserWindow.h"
 #include "AssetEditor/AssetEditorWindow.h"
 #include "GridSettingsDialog.h"
-#include "MaterialSender.h"
 #include "ActionManager.h"

 // uncomment this to show thumbnail demo widget