[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31228] trunk/blender/source/blender/ editors/interface/interface_draw.c: Fix silly bug with color ramp ui where there was an extra pixel

Matt Ebb matt at mke3.net
Wed Aug 11 04:31:55 CEST 2010


Revision: 31228
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31228
Author:   broken
Date:     2010-08-11 04:31:54 +0200 (Wed, 11 Aug 2010)

Log Message:
-----------
Fix silly bug with color ramp ui where there was an extra pixel 
of background on the right side

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	2010-08-11 02:13:34 UTC (rev 31227)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c	2010-08-11 02:31:54 UTC (rev 31228)
@@ -1146,7 +1146,7 @@
 	glColor4fv( &cbd->r );
 	glVertex2fv(v1); glVertex2fv(v2);
 	
-	for( a = 1; a < sizex; a++ ) {
+	for( a = 1; a <= sizex; a++ ) {
 		pos = ((float)a) / (sizex-1);
 		do_colorband( coba, pos, colf );
 		if (but->block->color_profile != BLI_PR_NONE)
@@ -1163,20 +1163,9 @@
 	glDisable(GL_BLEND);
 	
 	/* outline */
-	v1[0]= x1; v1[1]= y1;
+	glColor4f(0.0, 0.0, 0.0, 1.0);
+	fdrawbox(x1, y1, x1+sizex, y1+sizey);
 	
-	cpack(0x0);
-	glBegin(GL_LINE_LOOP);
-	glVertex2fv(v1);
-	v1[0]+= sizex;
-	glVertex2fv(v1);
-	v1[1]+= sizey;
-	glVertex2fv(v1);
-	v1[0]-= sizex;
-	glVertex2fv(v1);
-	glEnd();
-	
-	
 	/* help lines */
 	v1[0]= v2[0]=v3[0]= x1;
 	v1[1]= y1;
@@ -1231,6 +1220,7 @@
 		}	
 	}
 	glEnd();
+
 }
 
 void ui_draw_but_NORMAL(uiBut *but, uiWidgetColors *wcol, rcti *rect)





More information about the Bf-blender-cvs mailing list