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
@@ -490,8 +490,9 @@ namespace MaterialEditor
appType.m_maskValue = AZ::ApplicationTypeQuery::Masks::Game;
}
void MaterialEditorApplication::OnTraceMessage(AZStd::string_view message)
void MaterialEditorApplication::OnTraceMessage([[maybe_unused]] AZStd::string_view message)
{
#if defined(AZ_ENABLE_TRACING)
AZStd::vector<AZStd::string> lines;
AzFramework::StringFunc::Tokenize(
message,
@@ -505,6 +506,7 @@ namespace MaterialEditor
{
AZ_TracePrintf("MaterialEditor", "Python: %s\n", line.c_str());
}
#endif
}
void MaterialEditorApplication::OnErrorMessage(AZStd::string_view message)