Merge pull request #2582 from aws-lumberyard-dev/carlitosan_fix_for

fix for double asset registration and multiple outs from loop nodes
2021-07-29 09:11:58 -07:00
parent 38b64466ec 9475d1612b
commit a18d91e786
3 changed files with 2216 additions and 2 deletions
@@ -82,7 +82,6 @@ namespace GraphCanvas
        AZStd::unique_ptr<TranslationAssetHandler> m_assetHandler;

        void RegisterTranslationBuilder();
-
        void UnregisterAssetHandler();
        TranslationAssetWorker m_translationAssetWorker;
        AZStd::vector<AZ::Data::AssetId> m_translationAssets;
@@ -3230,7 +3230,7 @@ namespace ScriptCanvas
            auto valueSlot = forEachNodeSC->GetSlot(forEachNodeSC->GetValueSlotId());
            AZ_Assert(valueSlot, "no value slot in for each node");

-            lastExecution->AddChild({});
+            lastExecution->AddChild({ &loopSlot, {}, nullptr });
            auto outputValue = CreateOutputData(lastExecution, lastExecution->ModChild(0), *valueSlot);
            lastExecution->ModChild(0).m_output.push_back({ valueSlot, outputValue });