Merge commit '71ef2336cbab4cca1d1b228cdb89601f6569c107' into master-merge

[xonotic/netradiant.git] / radiant / camwindow.h

diff --git a/radiant/camwindow.h b/radiant/camwindow.h
index 312cf66d8b54976fb10d8b57f4afee592c148f22..9ed6d24260d0013dc149e906ba91473948d7ceea 100644 (file)
--- a/radiant/camwindow.h
+++ b/radiant/camwindow.h
@@ -34,7 +34,7 @@ void AddCameraMovedCallback( const SignalHandler& handler );
 
 void CamWnd_Update( CamWnd& camwnd );
 
-ui::Widget CamWnd_getWidget( CamWnd& camwnd );
+ui::GLArea CamWnd_getWidget( CamWnd& camwnd );
 void CamWnd_setParent( CamWnd& camwnd, ui::Window parent );
 
 void GlobalCamera_setCamWnd( CamWnd& camwnd );
@@ -69,7 +69,7 @@ struct camwindow_globals_t
        camwindow_globals_t() :
                color_cameraback( 0.25f, 0.25f, 0.25f ),
                color_selbrushes3d( 1.0f, 0.f, 0.f ),
-               m_nCubicScale( 13 ){
+               m_nCubicScale( 26 ){
        }
 
 };