From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 25 May 2020 18:21:45 +0000 (+0200)
Subject: Merge commit 'e8686a54bfc307bb810c8a724f914bfff28d7351' into garux-merge
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=c5a6237a2b002c9811719172931b0c9cc5a725f4

Merge commit 'e8686a54bfc307bb810c8a724f914bfff28d7351' into garux-merge
---

c5a6237a2b002c9811719172931b0c9cc5a725f4
diff --cc radiant/selection.cpp
index 1ecd3624,7f4cdf7a..18334c20
--- a/radiant/selection.cpp
+++ b/radiant/selection.cpp
@@@ -3660,18 -3654,11 +3658,11 @@@ void mouseMoved( DeviceVector position 
  										m_paintSelect ? RadiantSelectionSystem::eSelect : RadiantSelectionSystem::eDeselect,
  										( m_state & c_modifier_face ) != c_modifierNone );
  	}
- 	else{
- 		DeviceVector delta( position - m_start );
- 		if ( fabs( delta.x() ) > m_epsilon.x() || fabs( delta.y() ) > m_epsilon.y() ) {
- 			m_paintSelect = getSelectionSystem().SelectPoint_InitPaint( *m_view, &position[0], &m_epsilon[0], ( m_state & c_modifier_face ) != c_modifierNone );
- 			m_paintInitialized = true;
- 		}
- 	}
  }
 -typedef MemberCaller1<Selector_, DeviceVector, &Selector_::mouseMoved> MouseMovedCaller;
 +typedef MemberCaller<Selector_, void(DeviceVector), &Selector_::mouseMoved> MouseMovedCaller;
  
  void mouseUp( DeviceVector position ){
- 	if( !m_paintInitialized ){
+ 	if( m_mouse2 ){
  		testSelect( device_constrained( position ) );
  	}
  	else{