From: Thomas Debesse <dev@illwieckz.net>
Date: Tue, 26 May 2020 14:31:18 +0000 (+0200)
Subject: Merge commit '0709fce07d9c630ca0455ebeb58e3806427ca8ce' into garux-merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d930835fa0ffd32d2e6459e11e526ec0733745bc;p=xonotic%2Fnetradiant.git

Merge commit '0709fce07d9c630ca0455ebeb58e3806427ca8ce' into garux-merge
---

d930835fa0ffd32d2e6459e11e526ec0733745bc
diff --cc radiant/selection.cpp
index 11e2337e,a3df8a31..0899ce24
--- a/radiant/selection.cpp
+++ b/radiant/selection.cpp
@@@ -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();