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

fix interpreted statics

Browse Source 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
carlitosan
2021-12-08 23:23:03 -08:00
parent 9830925309
commit a5b30ffc5a
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
+5 -4
View File
@@ -503,20 +503,21 @@ namespace ScriptCanvas
void InitializeInterpretedStatics(RuntimeData& runtimeData) void InitializeInterpretedStatics(RuntimeData& runtimeData)
{ {
if (!runtimeData.m_areStaticsInitialized) AZ_Error("ScriptCanvas", !runtimeData.m_areStaticsInitialized, "ScriptCanvas runtime data already initalized");
{ {
runtimeData.m_areStaticsInitialized = true; runtimeData.m_areStaticsInitialized = true;
for (auto& dependency : runtimeData.m_requiredAssets) for (auto& dependency : runtimeData.m_requiredAssets)
{ {
InitializeInterpretedStatics(dependency.Get()->GetData()); if (!dependency.Get()->GetData().m_areStaticsInitialized)
{
InitializeInterpretedStatics(dependency.Get()->GetData());
}
} }
#if defined(AZ_PROFILE_BUILD) || defined(AZ_DEBUG_BUILD) #if defined(AZ_PROFILE_BUILD) || defined(AZ_DEBUG_BUILD)
Execution::InitializeFromLuaStackFunctions(const_cast<Grammar::DebugSymbolMap&>(runtimeData.m_debugMap)); Execution::InitializeFromLuaStackFunctions(const_cast<Grammar::DebugSymbolMap&>(runtimeData.m_debugMap));
#endif #endif
AZ_WarningOnce("ScriptCanvas", !runtimeData.m_areStaticsInitialized, "ScriptCanvas runtime data already initalized");
if (runtimeData.RequiresStaticInitialization()) if (runtimeData.RequiresStaticInitialization())
{ {
AZ::ScriptLoadResult result{}; AZ::ScriptLoadResult result{};
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp
+4 -1
View File
@@ -49,7 +49,10 @@ namespace ScriptCanvas
, config.asset.GetId().ToString<AZStd::string>().data()); , config.asset.GetId().ToString<AZStd::string>().data());
#endif #endif
Execution::InitializeInterpretedStatics(runtimeAsset->GetData()); if (!runtimeAsset->GetData().m_areStaticsInitialized)
{
Execution::InitializeInterpretedStatics(runtimeAsset->GetData());
}
} }
void ExecutionStateInterpreted::ClearLuaRegistryIndex() void ExecutionStateInterpreted::ClearLuaRegistryIndex()