Merge commit 'e8686a54bfc307bb810c8a724f914bfff28d7351' into garux-merge

diff --cc radiant/selection.cpp
index 1ecd3624affb4cc1ec256850548d85b9cbe58cc7,7f4cdf7a1d0eebadde55ee7fec4de2c29a3e54ad..18334c2090369753e01f1b5f9132e587424f3db8
--- 1/radiant/selection.cpp
--- 2/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{

diff --cc radiant/xywindow.cpp
Simple merge