Integrating latest 47acbe8

This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
@@ -52,11 +52,6 @@ AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnin
#include <QMessageBox>
AZ_POP_DISABLE_WARNING
namespace Platform
{
void LoadPluginDependencies();
}
namespace MaterialEditor
{
//! This function returns the build system target name of "MaterialEditor
@@ -172,8 +167,6 @@ namespace MaterialEditor
AzFramework::Application::StartCommon(systemEntity);
Platform::LoadPluginDependencies();
StartInternal();
m_timer.start();