Merge commit '4616fea08c641887b841bffa3a974dae63b4c7e7' into garux-merge

diff --cc radiant/camwindow.cpp
index 6fab7dc994da67aaa830d367751316f651e2ecd9,37bcaba3e23f4c34ba211069d21329007b4c57e0..804d6461a71c16a759e8fe004e420cfad688982b
--- 1/radiant/camwindow.cpp
--- 2/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@@ -793,16 -799,16 +793,16 @@@ void Camera_setAngles( CamWnd& camwnd, 
  // =============================================================================
  // CamWnd class
  
 -gboolean enable_freelook_button_press( GtkWidget* widget, GdkEventButton* event, CamWnd* camwnd ){
 +gboolean enable_freelook_button_press( ui::Widget widget, GdkEventButton* event, CamWnd* camwnd ){
-       if ( event->type == GDK_BUTTON_PRESS && event->button == 3 ) {
+       if ( event->type == GDK_BUTTON_PRESS && event->button == 3 && modifiers_for_state( event->state ) == c_modifierNone ) {
                camwnd->EnableFreeMove();
                return TRUE;
        }
        return FALSE;
  }
  
 -gboolean disable_freelook_button_press( GtkWidget* widget, GdkEventButton* event, CamWnd* camwnd ){
 +gboolean disable_freelook_button_press( ui::Widget widget, GdkEventButton* event, CamWnd* camwnd ){
-       if ( event->type == GDK_BUTTON_PRESS && event->button == 3 ) {
+       if ( event->type == GDK_BUTTON_PRESS && event->button == 3 && modifiers_for_state( event->state ) == c_modifierNone ) {
                camwnd->DisableFreeMove();
                return TRUE;
        }

diff --cc radiant/selection.cpp
Simple merge

diff --cc radiant/xywindow.cpp
Simple merge