birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
chcurran
2021-09-07 09:35:04 -07:00
parent 4ed7feae5d e20c270580
commit 64ab627f03
1896 changed files with 9868 additions and 19584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h
+1 -1
View File
@@ -15,7 +15,7 @@
#include <ScriptCanvas/Core/Core.h>
#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE)
#if !defined(_RELEASE)
// the markers are defined in test, but the system that listens for calls won't always be enabled
#define SCRIPT_CANVAS_PERFORMANCE_TRACKING_ENABLED
#endif
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
+2 -7
View File
@@ -465,12 +465,7 @@ namespace ScriptCanvas
lua_register(lua, k_UnpackDependencyConstructionArgsFunctionName, &UnpackDependencyConstructionArgs);
lua_register(lua, k_UnpackDependencyConstructionArgsLeafFunctionName, &UnpackDependencyConstructionArgsLeaf);
#if defined(PERFORMANCE_BUILD)
lua_pushboolean(lua, true);
lua_setglobal(lua, k_InterpretedConfigurationPerformance);
lua_pushboolean(lua, false);
lua_setglobal(lua, k_InterpretedConfigurationRelease);
#elif defined(_RELEASE)
#if defined(_RELEASE)
lua_pushboolean(lua, false);
lua_setglobal(lua, k_InterpretedConfigurationPerformance);
lua_pushboolean(lua, true);
@@ -481,7 +476,7 @@ namespace ScriptCanvas
lua_setglobal(lua, k_InterpretedConfigurationPerformance);
lua_pushboolean(lua, false);
lua_setglobal(lua, k_InterpretedConfigurationRelease);
#endif//defined(PERFORMANCE_BUILD)
#endif
lua_register(lua, k_GetRandomSwitchControlNumberName, &GetRandomSwitchControlNumber);
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include <ScriptCanvas/Execution/ExecutionContext.h>
#include <ScriptCanvas/Execution/ExecutionState.h>
#if !defined(_RELEASE) && !defined(PERFORMANCE_BUILD)
#if !defined(_RELEASE)
#define SCRIPT_CANVAS_RUNTIME_ASSET_CHECK
#endif
Gems/ScriptCanvas/Code/Source/SystemComponent.cpp
+1 -1
View File
@@ -34,7 +34,7 @@
namespace ScriptCanvasSystemComponentCpp
{
#if !defined(_RELEASE) && !defined(PERFORMANCE_BUILD)
#if !defined(_RELEASE)
const int k_infiniteLoopDetectionMaxIterations = 1000000;
const int k_maxHandlerStackDepth = 25;
#else