Parcourir la source

Merge pull request #441 from aws-lumberyard-dev/rgba16f/ScriptManagerCompileFix

Fix script manager compile error due to o3de change
rgba16f il y a 3 ans
Parent
commit
0a57565fe4
1 fichiers modifiés avec 2 ajouts et 5 suppressions
  1. 2 5
      Gem/Code/Source/Automation/ScriptManager.cpp

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

@@ -966,11 +966,8 @@ namespace AtomSampleViewer
 
         s_instance->m_executingScripts.insert(scriptAsset.GetId());
 
-        bool executeSuccess = false;
-        AZ::ScriptSystemRequestBus::BroadcastResult(
-            executeSuccess, &AZ::ScriptSystemRequestBus::Events::Load, scriptAsset, AZ::k_scriptLoadBinaryOrText,
-            s_instance->m_scriptContext->GetId());
-        if (!executeSuccess)
+        auto& scriptData = scriptAsset->m_data;
+        if (!s_instance->m_scriptContext->Execute(scriptData.GetScriptBuffer().data(), scriptFilePath.c_str(), scriptData.GetScriptBuffer().size()))
         {
             // 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.