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
@@ -304,7 +304,7 @@ namespace EMotionFX
topRowLayout->addWidget(m_addMotionsLabel);
m_pickButton = new QPushButton(this);
EMStudio::EMStudioManager::MakeTransparentButton(m_pickButton, "/Images/Icons/Plus.svg", "Add motions to blend space");
EMStudio::EMStudioManager::MakeTransparentButton(m_pickButton, "Images/Icons/Plus.svg", "Add motions to blend space");
m_pickButton->setObjectName("EMFX.MotionSetMotionIdPicker.PickButton");
connect(m_pickButton, &QPushButton::clicked, this, &MotionSetMotionIdPicker::OnPickClicked);
topRowLayout->addWidget(m_pickButton);