]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
Merge commit '0709fce07d9c630ca0455ebeb58e3806427ca8ce' into garux-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 26 May 2020 14:31:18 +0000 (16:31 +0200)
committerThomas Debesse <dev@illwieckz.net>
Tue, 26 May 2020 14:31:18 +0000 (16:31 +0200)
1  2 
radiant/selection.cpp

index 11e2337e0e63700348c4b790546f00f7d4291949,a3df8a3159a1963cd09d9014d2872af19fd89ffe..0899ce24454c50f73364f9d4721cc3416fcfb636
@@@ -4047,9 -4087,9 +4091,9 @@@ bool mouseDown( DeviceVector position )
  }
  
  void mouseMoved( DeviceVector position ){
-       getSelectionSystem().MoveSelected( *m_view, &position[0], ( m_state & c_modifierShift ) == c_modifierShift );
+       getSelectionSystem().MoveSelected( *m_view, &position[0], ( m_state & c_modifierShift ) == c_modifierShift, ( m_state & c_modifierControl ) == c_modifierControl );
  }
 -typedef MemberCaller1<Manipulator_, DeviceVector, &Manipulator_::mouseMoved> MouseMovedCaller;
 +typedef MemberCaller<Manipulator_, void(DeviceVector), &Manipulator_::mouseMoved> MouseMovedCaller;
  
  void mouseUp( DeviceVector position ){
        getSelectionSystem().endMove();