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

EMotion FX: Resetting the Motion extraction joint when the Anim Graph is active crashes the Editor (#4138)

Browse Source 
Wrong invalid index type caused the crash. Selecting another joint was broken as well and got fixed directly, too. The selection done event was never received due to not being connected to the node hierarchy widget.

Resolves #4108

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
This commit is contained in:
Benjamin Jillich
2021-09-16 12:41:24 +02:00
committed by GitHub
parent 7e85b1512a
commit 7c3f59ba5e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
+1 -1
View File
@@ -1245,7 +1245,7 @@ namespace EMotionFX
}
else
{
SetMotionExtractionNodeIndex(MCORE_INVALIDINDEX32);
SetMotionExtractionNodeIndex(InvalidIndex);
}
}
Gems/EMotionFX/Code/Source/Editor/ActorJointBrowseEdit.cpp
+1
View File
@@ -66,6 +66,7 @@ namespace EMStudio
m_jointSelectionWindow = new NodeSelectionWindow(this, m_singleJointSelection);
connect(m_jointSelectionWindow, &NodeSelectionWindow::rejected, this, &ActorJointBrowseEdit::OnSelectionRejected);
connect(m_jointSelectionWindow->GetNodeHierarchyWidget()->GetTreeWidget(), &QTreeWidget::itemSelectionChanged, this, &ActorJointBrowseEdit::OnSelectionChanged);
connect(m_jointSelectionWindow->GetNodeHierarchyWidget(), &NodeHierarchyWidget::OnSelectionDone, this, &ActorJointBrowseEdit::OnSelectionDone);
NodeSelectionWindow::connect(m_jointSelectionWindow, &QDialog::finished, [=]([[maybe_unused]] int resultCode)
{