Merge branch 'development' into cmake/SPEC-7484

This commit is contained in:
Esteban Papp
2021-08-10 14:30:07 -07:00
153 changed files with 5217 additions and 2016 deletions
-3
View File
@@ -1626,9 +1626,6 @@ bool CCryEditApp::InitInstance()
ReflectedVarInit::setupReflection(serializeContext);
RegisterReflectedVarHandlers();
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
CreateSplashScreen();
// Register the application's document templates. Document templates