eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-10-12 23:13:51 +02:00
parent 2a00d52525 68f82be451
commit c7741c6618
32 changed files with 27 additions and 1514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
PyInt.cpp
View File

@@ -30,13 +30,8 @@ void render_task::run() {
// upload texture data
if( ( outputwidth != nullptr )
&& ( outputheight != nullptr ) ) {
const opengl_material &material = GfxRenderer.Material(m_target);
if (material.texture1 != null_handle)
{
GLuint id = GfxRenderer.Texture(material.texture1).id;
glBindTexture(GL_TEXTURE_2D, id);
}
::glBindTexture( GL_TEXTURE_2D, GfxRenderer.Texture( m_target ).id );
// setup texture parameters
::glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE );
::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );