Merge branch 'development' into cmake/linux_fix_warn_unused

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Legacy/CrySystem/Log.cpp # Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp # Code/Tools/Standalone/Source/Driller/AreaChart.cpp # Code/Tools/Standalone/Source/Driller/AreaChart.hxx # Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp # Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp # Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
2021-08-25 11:47:19 -07:00
parent cd5df6b372 b53182fdb6
commit 6b96be82ea
400 changed files with 1886 additions and 46899 deletions
@@ -22,6 +22,8 @@

 #if defined(SCRIPTEVENTS_EDITOR)

+AZ_DECLARE_BUDGET(AzToolsFramework);
+
 namespace ScriptEventsEditor
 {
    ////////////////////////////
@@ -26,6 +26,8 @@
 #include <ScriptEvents/ScriptEventDefinition.h>
 #include <ScriptEvents/ScriptEventFundamentalTypes.h>

+AZ_DEFINE_BUDGET(ScriptCanvas);
+
 namespace ScriptEvents
 {
    void ScriptEventsSystemComponent::Reflect(AZ::ReflectContext* context)
@@ -20,6 +20,8 @@
 #include <ScriptEvents/ScriptEventDefinition.h>
 #include <ScriptEvents/ScriptEventSystem.h>

+AZ_DECLARE_BUDGET(ScriptCanvas);
+
 namespace ScriptEvents
 {
   class ScriptEventsSystemComponent