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

fix for edit SC action in entity context menu (#6686)

Browse Source 
* on demand reflect az events when they are the return value of ebuses

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>

* fix crash and functionality for edit sc editor context menu action

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
carlitosan
2022-01-05 19:04:55 -08:00
committed by GitHub
parent 09fd52ef73
commit da0a10bb4c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
+4 -2
View File
@@ -265,11 +265,13 @@ namespace ScriptCanvasEditor
action = entityMenu->addAction(QString("%1").arg(QString(displayName.c_str()))); action = entityMenu->addAction(QString("%1").arg(QString(displayName.c_str())));
QObject::connect(action, &QAction::triggered, [assetId] QObject::connect(action, &QAction::triggered, [assetInfo]
{ {
AzToolsFramework::OpenViewPane(LyViewPane::ScriptCanvas); AzToolsFramework::OpenViewPane(LyViewPane::ScriptCanvas);
SourceHandle sourceHandle(nullptr, assetInfo.m_assetId.m_guid, "");
CompleteDescriptionInPlace(sourceHandle);
GeneralRequestBus::Broadcast(&GeneralRequests::OpenScriptCanvasAsset GeneralRequestBus::Broadcast(&GeneralRequests::OpenScriptCanvasAsset
, SourceHandle(nullptr, assetId.m_guid, "") , sourceHandle
, Tracker::ScriptCanvasFileState::UNMODIFIED, -1); , Tracker::ScriptCanvasFileState::UNMODIFIED, -1);
}); });
} }
Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
+1 -1
View File
@@ -1139,7 +1139,7 @@ namespace ScriptCanvasEditor
auto loadedGraphOutcome = LoadFromFile(fileAssetId.Path().c_str()); auto loadedGraphOutcome = LoadFromFile(fileAssetId.Path().c_str());
if (!loadedGraphOutcome.IsSuccess()) if (!loadedGraphOutcome.IsSuccess())
{ {
return AZ::Failure(AZStd::string("Failed to load graph at %s", fileAssetId.Path().c_str())); return AZ::Failure(AZStd::string::format("Failed to load graph at %s", fileAssetId.Path().c_str()));
} }
auto loadedGraph = loadedGraphOutcome.TakeValue(); auto loadedGraph = loadedGraphOutcome.TakeValue();