Merge commit 'f472e6f0e8066e62cf3e159287bb07de97d2e59d' into master-merge

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

diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp
index 9f6beb1a74281a9e6e38b4ac56100945f9ed1733..6bae24c738cc674ef4e6a3e30f2a51028814eb1a 100644 (file)
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -1429,7 +1429,7 @@ void render( const Matrix4& modelview, const Matrix4& projection ){
    Cam_Draw
    ==============
  */
-
+/*
 void ShowStatsToggle(){
        g_camwindow_globals_private.m_showStats ^= 1;
 }
@@ -1441,6 +1441,22 @@ void ShowStatsExport( const Callback<void(bool)> &importer ){
 FreeCaller<void(const Callback<void(bool)>&), ShowStatsExport> g_show_stats_caller;
 Callback<void(const Callback<void(bool)> &)> g_show_stats_callback( g_show_stats_caller );
 ToggleItem g_show_stats( g_show_stats_callback );
+*/
+
+void ShowStatsToggle(){
+       g_camwindow_globals_private.m_showStats ^= 1;
+//     g_show_stats.update();
+       UpdateAllWindows();
+}
+typedef FreeCaller<void(), ShowStatsToggle> ShowStatsToggleCaller;
+void ShowStatsExport( const Callback<void(bool)> & importer ){
+       importer( g_camwindow_globals_private.m_showStats );
+}
+typedef FreeCaller<void(const Callback<void(bool)> &), ShowStatsExport> ShowStatsExportCaller;
+
+ShowStatsExportCaller g_show_stats_caller;
+Callback<void(const Callback<void(bool)> &)> g_show_stats_callback( g_show_stats_caller );
+ToggleItem g_show_stats( g_show_stats_callback );
 
 void CamWnd::Cam_Draw(){
        glViewport( 0, 0, m_Camera.width, m_Camera.height );
@@ -1531,9 +1547,9 @@ void CamWnd::Cam_Draw(){
                break;
        }
 
-       if ( !g_xywindow_globals.m_bNoStipple ) {
+//     if ( !g_xywindow_globals.m_bNoStipple ) {
                globalstate |= RENDER_LINESTIPPLE | RENDER_POLYGONSTIPPLE;
-       }
+//     }
 
        {
                CamRenderer renderer( globalstate, m_state_select2, m_state_select1, m_view.getViewer() );