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:
authorGermano Cavalcante <germano.costa@ig.com.br>2017-03-16 07:13:18 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2017-03-16 07:13:18 +0300
commitdd7b60c638603e13b62891df4a768d904f742003 (patch)
treed9fbd3a277f5b61e26c04eccf8c42b4f6bbcffec /source/blender/editors/space_image
parent0fc4cf7637e8663aab695b2c33a6695f0604334f (diff)
Adds missing `immUnbindProgram()` in `image_draw`
This was interruping the execution of the code (To test: Just left click on the UV editing window to read the pixel)
Diffstat (limited to 'source/blender/editors/space_image')
-rw-r--r--source/blender/editors/space_image/image_draw.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index cabe9e6e8a9..fc872c9ada6 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -179,6 +179,8 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d
immUniformColor4ub(0, 0, 0, 190);
immRecti(pos, 0, 0, BLI_rcti_size_x(&ar->winrct) + 1, UI_UNIT_Y);
+ immUnbindProgram();
+
glDisable(GL_BLEND);
BLF_size(blf_mono_font, 11 * U.pixelsize, U.dpi);
@@ -360,6 +362,7 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d
immUniformColor3fv(finalcol);
immRecti(pos, color_rect.xmin, color_rect.ymin, color_rect.xmax, color_rect.ymax);
}
+ immUnbindProgram();
/* draw outline */
pos = add_attrib(immVertexFormat(), "pos", COMP_F32, 2, KEEP_FLOAT);