Merge commit 'a2bb968371194a92bdd6e2841f73c85a79ce2a20' into mbalfour/gitflow_211220_stabilization_2111RTE

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> # Conflicts: # Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp # Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp # Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.cpp # Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.h # Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp # Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.h # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerBus.h # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp # Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h # Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp # Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl # Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp # Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetHandler.h # Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.cpp # Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.h # Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasFileHandling.h # Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponent.h # Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp # Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp # Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp # Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.h # Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp # Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp # Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h # Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp # Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Modifier.cpp # Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Scanner.cpp # Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h # Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp # Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.h # Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp # Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp # Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp # Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
2021-12-20 14:42:47 -06:00
parent 79fcef41b3 a2bb968371
commit 2c8a93fb9c
4 changed files with 3 additions and 3 deletions
@@ -136,7 +136,7 @@ namespace GraphCanvas

                if (keyStr.empty())
                {
-                    AZ_Error("TranslationDatabase", false, "Every entry in the Translation data must have a key: %s", contextStr.c_str());
+                    AZ_Warning("TranslationDatabase", false, "Every entry in the Translation data must have a key: %s", baseKey.c_str());
                    return context.Report(JSR::Tasks::ReadField, JSR::Outcomes::Unsupported, "Every entry in the Translation data must have a key");
                }

@@ -62,7 +62,6 @@ namespace ScriptCanvasBuilder
        }

        // in terms of job creation, assert on anything but smooth sailing from this point
-
        AZ_Assert(sourceGraph, "Graph component is missing from entity.");
        AZ_Assert(graphData, "GraphData is missing from entity");

@@ -151,6 +151,7 @@
 #include <Editor/QtMetaTypes.h>
 #include <GraphCanvas/Components/SceneBus.h>

+#include <Editor/LyViewPaneNames.h>

 namespace ScriptCanvasEditor
 {
@@ -1616,6 +1617,7 @@ namespace ScriptCanvasEditor
        }

        PrepareAssetForSave(inMemoryAssetId);
+        ScriptCanvasAssetDescription assetDescription;

        AZStd::string suggestedFilename;
        AZStd::string suggestedFileFilter;
@@ -50,7 +50,6 @@
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>

 #include <Editor/View/Widgets/AssetGraphSceneDataBus.h>
-
 #include <Editor/View/Windows/Tools/UpgradeTool/Controller.h>
 #include <Editor/View/Windows/Tools/UpgradeTool/FileSaver.h>