Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development

2021-10-05 10:12:04 -07:00
parent a870c6ad80 256564a3e0
commit 580cc7811e
650 changed files with 131390 additions and 5413 deletions
@@ -154,7 +154,9 @@ namespace ScriptCanvasEditor

            const ScriptEvents::ScriptEvent& definition = data->m_definition;

+#if defined(AZ_ENABLE_TRACING)
            bool recategorize = previousDefinition ? definition.GetCategory().compare(previousDefinition->GetCategory()) != 0 : false;
+#endif
            AZ_Warning("ScriptCanvas", !recategorize, "Unable to recategorize ScriptEvents events while open. Please close and re-open the Script Canvas Editor to see the new categorization");

            if (definition.GetName().empty())