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

[LYN-3845] On the Actor component, click on the Animation Editor button, EMFX isn't opening (#1169)

Browse Source 
We're opening the Animation Editor now also in case no actor has been chosen yet. In this case the Animation Editor will also just be started without loading any assets.
This commit is contained in:
Benjamin Jillich
2021-06-08 07:39:35 +02:00
committed by GitHub
parent 7ca7ad9b72
commit 4e79e6004c
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
+4 -6
View File
@@ -435,19 +435,17 @@ namespace EMotionFX
void EditorActorComponent::LaunchAnimationEditor(const AZ::Data::AssetId& assetId, const AZ::Data::AssetType&)
{
// call to open must be done before LoadCharacter
const char* panelName = EMStudio::MainWindow::GetEMotionFXPaneName();
EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, OpenViewPane, panelName);
if (assetId.IsValid())
{
AZ::Data::AssetId animgraphAssetId;
animgraphAssetId.SetInvalid();
EditorAnimGraphComponentRequestBus::EventResult(animgraphAssetId, GetEntityId(), &EditorAnimGraphComponentRequestBus::Events::GetAnimGraphAssetId);
AZ::Data::AssetId motionSetAssetId;
motionSetAssetId.SetInvalid();
EditorAnimGraphComponentRequestBus::EventResult(motionSetAssetId, GetEntityId(), &EditorAnimGraphComponentRequestBus::Events::GetMotionSetAssetId);
// call to open must be done before LoadCharacter
const char* panelName = EMStudio::MainWindow::GetEMotionFXPaneName();
EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, OpenViewPane, panelName);
EMStudio::MainWindow* mainWindow = EMStudio::GetMainWindow();
if (mainWindow)
{