Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -412,8 +412,9 @@ namespace ShaderManagementConsole
appType.m_maskValue = AZ::ApplicationTypeQuery::Masks::Game;
}
void ShaderManagementConsoleApplication::OnTraceMessage(AZStd::string_view message)
void ShaderManagementConsoleApplication::OnTraceMessage([[maybe_unused]] AZStd::string_view message)
{
#if defined(AZ_ENABLE_TRACING)
AZStd::vector<AZStd::string> lines;
AzFramework::StringFunc::Tokenize(
message,
@@ -427,6 +428,7 @@ namespace ShaderManagementConsole
{
AZ_TracePrintf("Shader Management Console", "Python: %s\n", line.c_str());
}
#endif
}
void ShaderManagementConsoleApplication::OnErrorMessage(AZStd::string_view message)