Commit 4a8901ac authored by Matthias Möller's avatar Matthias Möller

- fix possible actionmode change on selection an object

- fix uninitialized action-/pickingmode

closes #2248

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@19392 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 49248172
......@@ -135,7 +135,9 @@ void OMPropertyModel<MeshT>::updateWidget(const QModelIndexList& selectedIndices
else
{
mPickWidget.hide();
resetPicking();
//reset Picking, just if picking was enabled
if (mPickWidget.pickButton->isChecked())
resetPicking();
}
}
......
......@@ -91,6 +91,9 @@ OVMPropertyModel<MeshT>::OVMPropertyModel(MeshT* mesh, int objectID, QObject *pa
QString iconPath = OpenFlipper::Options::iconDirStr() + OpenFlipper::Options::dirSeparator();
mPickWidget.pickButton->setIcon( QIcon(iconPath + "color-picker.png") );
lastPickMode = PluginFunctions::pickMode();
lastActionMode = PluginFunctions::actionMode();
initializeSupportedPropertyTypes();
}
......@@ -123,7 +126,9 @@ void OVMPropertyModel<MeshT>::updateWidget(const QModelIndexList& selectedIndice
else
{
mPickWidget.hide();
resetPicking();
//reset Picking, just if picking was enabled
if (mPickWidget.pickButton->isChecked())
resetPicking();
}
}
......
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