Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2015-11-28 03:45:23 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2015-11-28 17:35:34 +0300
commitc76fbf10e2f6dc766763a760e5bb34f64274a253 (patch)
treea0b50faa4223b428151d40a74b0a90159d9efe6b /source/blender/editors/space_clip
parent8e1c63b3962e8e51fca23c19915c8dba675391e8 (diff)
OpenGL: remove unnecessarily paranoid bound texture preservation.
Diffstat (limited to 'source/blender/editors/space_clip')
-rw-r--r--source/blender/editors/space_clip/clip_draw.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index d3538f6557a..848883aacc1 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -1063,7 +1063,7 @@ static void draw_plane_marker_image(Scene *scene,
}
if (display_buffer) {
- GLuint texid, last_texid;
+ GLuint texid;
float frame_corners[4][2] = {{0.0f, 0.0f},
{1.0f, 0.0f},
{1.0f, 1.0f},
@@ -1085,7 +1085,6 @@ static void draw_plane_marker_image(Scene *scene,
glColor4f(1.0, 1.0, 1.0, plane_track->image_opacity);
- last_texid = glaGetOneInteger(GL_TEXTURE_2D);
glEnable(GL_TEXTURE_2D);
glGenTextures(1, (GLuint *)&texid);
@@ -1109,7 +1108,7 @@ static void draw_plane_marker_image(Scene *scene,
glPopMatrix();
- glBindTexture(GL_TEXTURE_2D, last_texid);
+ glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_TEXTURE_2D);
if (transparent) {