Commit b85e8851 authored by Jan Möbius's avatar Jan Möbius

Modified drawmodes for better support of the xor



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@15663 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 5a01ed9e
......@@ -697,12 +697,12 @@ void ViewControlPlugin::slotDrawModeSelected( QAction * _action) {
//======================================================================================
if ( _action->text() != USEGLOBALDRAWMODE ) {
// As this is not the global draw mode, filter out default as draw mode or it will interfere with the other modes!
activeDrawModes_ = ( ( activeDrawModes_ | ACG::SceneGraph::DrawModes::DEFAULT ) ^ ACG::SceneGraph::DrawModes::DEFAULT );
activeDrawModes_.filter(ACG::SceneGraph::DrawModes::DEFAULT);
// If shift is pressed, we combine the modes (and toggle therefore xor)
// Otherwise we directly take the new mode
if ( qApp->keyboardModifiers() & Qt::ShiftModifier )
activeDrawModes_ = ( activeDrawModes_ ^ mode);
activeDrawModes_.combine(mode);
else
{
emit hideContextMenu();
......
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