From: Thomas Debesse <dev@illwieckz.net>
Date: Tue, 21 Jun 2022 02:52:21 +0000 (+0200)
Subject: Merge commit '1a0075a3f03af095ee32ded7f101cac79267f906' into master-merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e8ee23459b69f28cb9c0e013665db80b836a0d9b;p=xonotic%2Fnetradiant.git

Merge commit '1a0075a3f03af095ee32ded7f101cac79267f906' into master-merge
---

e8ee23459b69f28cb9c0e013665db80b836a0d9b
diff --cc radiant/mainframe.cpp
index acc56f61,c2efdc3a..ec650edf
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@@ -2184,14 -2092,12 +2170,15 @@@ ui::MenuItem create_view_menu( MainFram
  		create_menu_item_with_mnemonic( camera_menu, "Far Clip Plane In", "CubicClipZoomIn" );
  		create_menu_item_with_mnemonic( camera_menu, "Far Clip Plane Out", "CubicClipZoomOut" );
  		menu_separator( camera_menu );
 +		create_menu_item_with_mnemonic( camera_menu, "Decrease FOV", "FOVDec" );
 +		create_menu_item_with_mnemonic( camera_menu, "Increase FOV", "FOVInc" );
 +		menu_separator( camera_menu );
  		create_menu_item_with_mnemonic( camera_menu, "Next leak spot", "NextLeakSpot" );
  		create_menu_item_with_mnemonic( camera_menu, "Previous leak spot", "PrevLeakSpot" );
- 		menu_separator( camera_menu );
- 		create_menu_item_with_mnemonic( camera_menu, "Look Through Selected", "LookThroughSelected" );
- 		create_menu_item_with_mnemonic( camera_menu, "Look Through Camera", "LookThroughCamera" );
+ 		//cameramodel is not implemented in instances, thus useless
+ //		menu_separator( camera_menu );
+ //		create_menu_item_with_mnemonic( camera_menu, "Look Through Selected", "LookThroughSelected" );
+ //		create_menu_item_with_mnemonic( camera_menu, "Look Through Camera", "LookThroughCamera" );
  	}
  	menu_separator( menu );
  	{
diff --cc radiant/xywindow.cpp
index e5128ae7,e573d656..63ef5973
--- a/radiant/xywindow.cpp
+++ b/radiant/xywindow.cpp
@@@ -827,9 -822,11 +827,10 @@@ gboolean xywnd_expose( ui::Widget widge
  	return FALSE;
  }
  
 -
  void XYWnd_CameraMoved( XYWnd& xywnd ){
  	if ( g_xywindow_globals_private.m_bCamXYUpdate ) {
- 		XYWnd_Update( xywnd );
+ 		//XYWnd_Update( xywnd );
+ 		xywnd.UpdateCameraIcon();
  	}
  }