[Bf-blender-cvs] [dd7b60c638] blender2.8: Adds missing `immUnbindProgram()` in `image_draw`

Germano Cavalcante noreply at git.blender.org
Thu Mar 16 05:13:31 CET 2017


Commit: dd7b60c638603e13b62891df4a768d904f742003
Author: Germano Cavalcante
Date:   Thu Mar 16 01:13:18 2017 -0300
Branches: blender2.8
https://developer.blender.org/rBdd7b60c638603e13b62891df4a768d904f742003

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)

===================================================================

M	source/blender/editors/space_image/image_draw.c

===================================================================

diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index cabe9e6e8a..fc872c9ada 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);




More information about the Bf-blender-cvs mailing list