diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-03-27 04:05:02 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-03-27 04:23:54 +0300 |
| commit | a68cc0dc26bf55a9087375f8d104fcccd8571844 (patch) | |
| tree | 3e01e14e4efb48981b81328456d5a0c332830650 /source/blender/editors/space_view3d/drawmesh.c | |
| parent | 67ffad8cd2b44d7685ec5aec2a76e1cb13d9f7a1 (diff) | |
OpenGL: use old API for texture matrix
New matrix API does not support texture matrices. Not sure what the final code will look like, but this at least avoids interference with new ModelView matrix.
Marked each line with TEXTURE so they can be disregarded during searches.
Related to T49450
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 102a754e6de..92fb8d3efa1 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -1104,7 +1104,7 @@ static void tex_mat_set_texture_cb(void *userData, int mat_nr, void *attribs) glBindTexture(GL_TEXTURE_2D, ima->bindcode[TEXTARGET_TEXTURE_2D]); glMatrixMode(GL_TEXTURE); - gpuLoadMatrix3D(texbase->tex_mapping.mat); + glLoadMatrixf((float*) texbase->tex_mapping.mat); /* TEXTURE */ glMatrixMode(GL_MODELVIEW); /* use active UV texture layer */ @@ -1140,7 +1140,7 @@ static void tex_mat_set_texture_cb(void *userData, int mat_nr, void *attribs) } else { glMatrixMode(GL_TEXTURE); - gpuLoadIdentity(); + glLoadIdentity(); /* TEXTURE */ glMatrixMode(GL_MODELVIEW); /* enable solid material */ @@ -1243,7 +1243,7 @@ void draw_mesh_textured(Scene *scene, SceneLayer *sl, View3D *v3d, RegionView3D glFrontFace(GL_CCW); glMatrixMode(GL_TEXTURE); - gpuLoadIdentity(); + glLoadIdentity(); /* TEXTURE */ glMatrixMode(GL_MODELVIEW); /* faceselect mode drawing over textured mesh */ |