浏览代码

Merge pull request #439 from aws-lumberyard-dev/Atom/amzn-tommy/ASV_FixBuildErrorFromScriptingChange

Fix build error from scripting change
Guthrie Adams 3 年之前
父节点
当前提交
80217fa65b
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      Gem/Code/Source/Automation/ScriptManager.cpp

+ 5 - 1
Gem/Code/Source/Automation/ScriptManager.cpp

@@ -966,7 +966,11 @@ namespace AtomSampleViewer
 
 
         s_instance->m_executingScripts.insert(scriptAsset.GetId());
         s_instance->m_executingScripts.insert(scriptAsset.GetId());
 
 
-        if (!s_instance->m_scriptContext->Execute(scriptAsset->GetScriptBuffer().data(), scriptFilePath.c_str(), scriptAsset->GetScriptBuffer().size()))
+        bool executeSuccess = false;
+        AZ::ScriptSystemRequestBus::BroadcastResult(
+            executeSuccess, &AZ::ScriptSystemRequestBus::Events::Load, scriptAsset, AZ::k_scriptLoadBinaryOrText,
+            s_instance->m_scriptContext->GetId());
+        if (!executeSuccess)
         {
         {
             // Push an error operation on the back of the queue instead of reporting it immediately so it doesn't get lost
             // Push an error operation on the back of the queue instead of reporting it immediately so it doesn't get lost
             // in front of a bunch of queued m_scriptOperations.
             // in front of a bunch of queued m_scriptOperations.