From 211dde06c8f6a3b34829550bc05ec3fc85488d7c Mon Sep 17 00:00:00 2001 From: milek7 Date: Sat, 16 Jun 2018 19:13:32 +0200 Subject: [PATCH] ouch, debug changes slipped into commit --- skydome.cpp | 1 - uilayer.cpp | 2 +- version.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/skydome.cpp b/skydome.cpp index e2e8f979..a781dfe6 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -2,7 +2,6 @@ #include "skydome.h" #include "color.h" #include "utilities.h" -#include // sky gradient based on "A practical analytic model for daylight" // by A. J. Preetham Peter Shirley Brian Smits (University of Utah) diff --git a/uilayer.cpp b/uilayer.cpp index 00175eec..cdf32076 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -973,7 +973,7 @@ ui_layer::render() { glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT);// | GL_COLOR_BUFFER_BIT ); // blendfunc included since 3rd party gui doesn't play nice + glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT ); // blendfunc included since 3rd party gui doesn't play nice glDisable( GL_LIGHTING ); glDisable( GL_DEPTH_TEST ); glDisable( GL_ALPHA_TEST ); diff --git a/version.h b/version.h index 3cb60cf0..19fd7f6f 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define VERSION_INFO "M7 16.06.2018, based on tmj ef5811e6" +#define VERSION_INFO "M7 16.06.2018/2, based on tmj ef5811e6"