Merge branch 'development' into Prism/ShowRepoList

This commit is contained in:
nggieber
2021-10-11 09:20:06 -07:00
889 changed files with 22679 additions and 14037 deletions
@@ -246,9 +246,11 @@ namespace O3DE::ProjectManager
if (Py_IsInitialized())
{
AZ_Warning("python", false, "Python is already active");
return false;
return m_pythonStarted;
}
m_pythonStarted = false;
// set PYTHON_HOME
AZStd::string pyBasePath = Platform::GetPythonHomePath(PY_PACKAGE, m_enginePath.c_str());
if (!AZ::IO::SystemFile::Exists(pyBasePath.c_str()))
@@ -304,7 +306,8 @@ namespace O3DE::ProjectManager
// make sure the engine is registered
RegisterThisEngine();
return !PyErr_Occurred();
m_pythonStarted = !PyErr_Occurred();
return m_pythonStarted;
}
catch ([[maybe_unused]] const std::exception& e)
{