eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 22:09:19 +02:00
Code Issues 123 Wiki Activity

Merge branch 'milek-dev'

Browse Source
This commit is contained in:
milek7
2018-06-16 19:15:35 +02:00
parent d6d4138218 211dde06c8
commit 6e33d13490
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
uilayer.cpp
View File

@@ -973,7 +973,7 @@ ui_layer::render() {
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); 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_LIGHTING );
glDisable( GL_DEPTH_TEST ); glDisable( GL_DEPTH_TEST );
glDisable( GL_ALPHA_TEST ); glDisable( GL_ALPHA_TEST );

2
version.h
View File

@@ -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"