Commit 52929c3a authored by Jan Möbius's avatar Jan Möbius

Fixed bug killing all other mouse plugins

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@13405 383ad7c9-94d9-4d36-a494-682f7c89f535
parent b3226885
...@@ -234,7 +234,7 @@ void SkeletonEditingPlugin::slotMouseWheelEvent(QWheelEvent * _event, const std: ...@@ -234,7 +234,7 @@ void SkeletonEditingPlugin::slotMouseWheelEvent(QWheelEvent * _event, const std:
/** \brief checks, if the skeleton can be modified. /** \brief checks, if the skeleton can be modified.
* a skeleton can be modified, if the active pose is the reference pose * a skeleton can be modified, if the active pose is the reference pose
* @param _event the event that occured * @param _event the event that occurred
*/ */
bool SkeletonEditingPlugin::canModify(QMouseEvent* _event) bool SkeletonEditingPlugin::canModify(QMouseEvent* _event)
{ {
...@@ -293,7 +293,9 @@ void SkeletonEditingPlugin::slotMouseEvent(QMouseEvent* _event) { ...@@ -293,7 +293,9 @@ void SkeletonEditingPlugin::slotMouseEvent(QMouseEvent* _event) {
moveJoint(_event); moveJoint(_event);
else if ( PluginFunctions::pickMode() == ("SelectJoints") ) else if ( PluginFunctions::pickMode() == ("SelectJoints") )
selectJoint(_event); selectJoint(_event);
else if (canModify(_event)) else if ( (( PluginFunctions::pickMode() == ("DeleteJoints")) ||
( PluginFunctions::pickMode() == ("InsertJoints")) ||
( PluginFunctions::pickMode() == ("SplitJoints") ) ) && canModify(_event) )
{ {
if ( PluginFunctions::pickMode() == ("DeleteJoints") ) if ( PluginFunctions::pickMode() == ("DeleteJoints") )
deleteJoint(_event); deleteJoint(_event);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment