Merge branch 'master' of goat:git/laserbrain_demo

diff --git a/src/app.cc b/src/app.cc
index 07ecdec..9f58b5f 100644 (file)
--- a/src/app.cc
+++ b/src/app.cc
@@ -559,6 +559,12 @@ void app_display()
                vp_width = win_width;
                vp_height = win_height;
 
+               if(!gfbo && !fb_srgb && sdr_post_gamma) {
+                       glViewport(0, 0, win_width, win_height);
+                       slow_post(sdr_post_gamma);
+                       glUseProgram(0);
+               }
+
                if(should_swap) {
                        app_swap_buffers();
                }

diff --git a/src/post.cc b/src/post.cc
index 885a212..a4d13cf 100644 (file)
--- a/src/post.cc
+++ b/src/post.cc
@@ -16,7 +16,6 @@ void slow_post(unsigned int sdr)
 
        glPushAttrib(GL_ENABLE_BIT);
        glDisable(GL_DEPTH_TEST);
-       glDisable(GL_LIGHTING);
 
        glUseProgram(sdr);