Integrating github/staging through commit 5f214be

This commit is contained in:
alexpete
2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -209,7 +209,7 @@ namespace EMotionFX
transitionLayout->addWidget(transitionLineEdit, row, 0);
QPushButton* removeTransitionButton = new QPushButton();
EMStudio::EMStudioManager::MakeTransparentButton(removeTransitionButton, "/Images/Icons/Trash.svg", "Remove transition from list");
EMStudio::EMStudioManager::MakeTransparentButton(removeTransitionButton, "Images/Icons/Trash.svg", "Remove transition from list");
connect(removeTransitionButton, &QPushButton::clicked, this, [this, removeTransitionButton, id]()
{
m_transitionIds.erase(AZStd::remove(m_transitionIds.begin(), m_transitionIds.end(), id), m_transitionIds.end());