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
@@ -36,7 +36,7 @@ namespace EMotionFX
hLayout->addWidget(m_pickButton);
m_resetButton = new QPushButton(this);
EMStudio::EMStudioManager::MakeTransparentButton(m_resetButton, "/Images/Icons/Clear.svg", "Reset selection");
EMStudio::EMStudioManager::MakeTransparentButton(m_resetButton, "Images/Icons/Clear.svg", "Reset selection");
connect(m_resetButton, &QPushButton::clicked, this, &ActorGoalNodePicker::OnResetClicked);
hLayout->addWidget(m_resetButton);
@@ -196,4 +196,4 @@ namespace EMotionFX
}
} // namespace EMotionFX
#include <Source/Editor/PropertyWidgets/moc_ActorGoalNodeHandler.cpp>
#include <Source/Editor/PropertyWidgets/moc_ActorGoalNodeHandler.cpp>