Integrating latest from github/staging

Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -221,8 +221,7 @@ sys.version
return static_cast<int>(LogTypes::Skip);
};
AZStd::string filename;
AzFramework::StringFunc::Path::ConstructFull(m_engineRoot, "Gems/EditorPythonBindings/Code/Tests", "EditorPythonBindingsTest", "py", filename);
AZ::IO::Path filename = AZ::IO::PathView(m_engineRoot / "Gems" / "EditorPythonBindings" / "Code" / "Tests" / "EditorPythonBindingsTest.py");
AZ::Entity e;
e.CreateComponent<EditorPythonBindings::PythonSystemComponent>();
@@ -284,8 +283,7 @@ sys.version
return static_cast<int>(LogTypes::Skip);
};
AZStd::string filename;
AzFramework::StringFunc::Path::ConstructFull(m_engineRoot, "Gems/EditorPythonBindings/Code/Tests", "EditorPythonBindingsTestWithArgs", "py", filename);
AZ::IO::Path filename = AZ::IO::PathView(m_engineRoot / "Gems" / "EditorPythonBindings" / "Code" / "Tests" / "EditorPythonBindingsTestWithArgs.py");
AZ::Entity e;
e.CreateComponent<EditorPythonBindings::PythonSystemComponent>();