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

Merging from development

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-12-07 12:35:41 -08:00
parent b1eeebb6b6
commit cd5306febf
334 changed files with 9946 additions and 3757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.h
+1
View File
@@ -11,6 +11,7 @@
#include <AzCore/Script/ScriptSystemBus.h>
#include <Editor/Framework/ScriptCanvasTraceUtilities.h>
#include <Editor/Framework/ScriptCanvasReporter.h>
#include <ScriptCanvas/Assets/ScriptCanvasFileHandling.h>
namespace ScriptCanvas
{
Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasTraceUtilities.h
+3 -3
View File
@@ -27,6 +27,7 @@
#include <ScriptCanvas/Libraries/Logic/Logic.h>
#include <ScriptCanvas/Libraries/Math/Math.h>
#include <ScriptCanvas/Variable/VariableBus.h>
#include <ScriptCanvas/Assets/ScriptCanvasFileHandling.h>
namespace AZ
{
@@ -45,11 +46,10 @@ namespace ScriptCanvasEditor
struct LoadTestGraphResult
{
AZStd::string_view m_graphPath;
AZStd::unique_ptr<AZ::Entity> m_entity;
ScriptCanvas::RuntimeComponent* m_runtimeComponent = nullptr;
bool m_nativeFunctionFound = false;
AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasAsset> m_editorAsset;
SourceHandle m_editorAsset;
AZ::Data::Asset<ScriptCanvas::RuntimeAsset> m_runtimeAsset;
AZ::Data::Asset<AZ::ScriptAsset> m_scriptAsset;
};
@@ -161,7 +161,7 @@ namespace ScriptCanvasEditor
struct ScopedOutputSuppression
{
ScopedOutputSuppression(bool suppressState = true)
ScopedOutputSuppression([[maybe_unused]] bool suppressState = true)
{
AZ::Debug::TraceMessageBus::BroadcastResult(m_oldSuppression, &AZ::Debug::TraceMessageEvents::OnOutput, "", "");
TraceSuppressionBus::Broadcast(&TraceSuppressionRequests::SuppressAllOutput, suppressState);