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

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2018-10-13 00:11:40 +02:00
parent cd8ffd5024 43f439af29
commit 141ecd90a4
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PyInt.cpp
View File

@@ -48,6 +48,8 @@ void render_task::run() {
PyInt_AsLong( outputwidth ), PyInt_AsLong( outputheight ), 0, PyInt_AsLong( outputwidth ), PyInt_AsLong( outputheight ), 0,
GL_RGB, GL_UNSIGNED_BYTE, reinterpret_cast<GLubyte const *>( PyString_AsString( output ) ) ); GL_RGB, GL_UNSIGNED_BYTE, reinterpret_cast<GLubyte const *>( PyString_AsString( output ) ) );
glGenerateMipmap(GL_TEXTURE_2D); glGenerateMipmap(GL_TEXTURE_2D);
glFlush();
} }
Py_DECREF( outputheight ); Py_DECREF( outputheight );
Py_DECREF( outputwidth ); Py_DECREF( outputwidth );

2
version.h
View File

@@ -1 +1 @@
#define VERSION_INFO "M7 (GL3) 13.10.2018, based on milek-04798821, tmj-68f82be4" #define VERSION_INFO "M7 (GL3) 13.10.2018/2, based on milek-43f439af, tmj-68f82be4"