[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39882] trunk/blender/source/blender/ editors/interface/interface_draw.c: Fix for grid lines drawing outside of histogram widget.

Sergey Sharybin g.ulairi at gmail.com
Fri Sep 2 21:25:33 CEST 2011


Revision: 39882
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39882
Author:   nazgul
Date:     2011-09-02 19:25:32 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Fix for grid lines drawing outside of histogram widget.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_draw.c

Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c	2011-09-02 18:05:07 UTC (rev 39881)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c	2011-09-02 19:25:32 UTC (rev 39882)
@@ -770,7 +770,11 @@
 	glColor4f(0.f, 0.f, 0.f, 0.3f);
 	uiSetRoundBox(15);
 	uiDrawBox(GL_POLYGON, rect.xmin-1, rect.ymin-1, rect.xmax+1, rect.ymax+1, 3.0f);
-	
+
+	/* need scissor test, histogram can draw outside of boundary */
+	glGetIntegerv(GL_VIEWPORT, scissor);
+	glScissor(ar->winrct.xmin + (rect.xmin-1), ar->winrct.ymin+(rect.ymin-1), (rect.xmax+1)-(rect.xmin-1), (rect.ymax+1)-(rect.ymin-1));
+
 	glColor4f(1.f, 1.f, 1.f, 0.08f);
 	/* draw grid lines here */
 	for (i=1; i<4; i++) {
@@ -778,10 +782,6 @@
 		fdrawline(rect.xmin+(i/4.f)*w, rect.ymin, rect.xmin+(i/4.f)*w, rect.ymax);
 	}
 	
-	/* need scissor test, histogram can draw outside of boundary */
-	glGetIntegerv(GL_VIEWPORT, scissor);
-	glScissor(ar->winrct.xmin + (rect.xmin-1), ar->winrct.ymin+(rect.ymin-1), (rect.xmax+1)-(rect.xmin-1), (rect.ymax+1)-(rect.ymin-1));
-	
 	if (hist->mode == HISTO_MODE_LUMA)
 		histogram_draw_one(1.0, 1.0, 1.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_luma, res);
 	else {




More information about the Bf-blender-cvs mailing list