[Bf-blender-cvs] [4491627] temp_viewport_fx_merge: move glColor outside loop

Mike Erwin noreply at git.blender.org
Thu Apr 2 02:29:19 CEST 2015


Commit: 4491627bfacf43c7cea3d4bc3ff2cac302d1b513
Author: Mike Erwin
Date:   Wed Apr 1 20:18:13 2015 -0400
Branches: temp_viewport_fx_merge
https://developer.blender.org/rB4491627bfacf43c7cea3d4bc3ff2cac302d1b513

move glColor outside loop

instead of repeatedly setting the same color

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

M	source/blender/editors/interface/interface_widgets.c

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

diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 442ce85..148adb6 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -782,19 +782,17 @@ static void widgetbase_draw(uiWidgetBase *wtb, uiWidgetColors *wcol)
 		                               wcol->item[1],
 		                               wcol->item[2],
 		                               (unsigned char)((float)wcol->item[3] / WIDGET_AA_JITTER)};
+		glColor4ubv(tcol);
 
 		/* for each AA step */
 		for (j = 0; j < WIDGET_AA_JITTER; j++) {
 			gpuTranslate(jit[j][0], jit[j][1], 0.0f);
 
-			if (wtb->tria1.tot) {
-				glColor4ubv(tcol);
+			if (wtb->tria1.tot)
 				widget_trias_draw(&wtb->tria1);
-			}
-			if (wtb->tria2.tot) {
-				glColor4ubv(tcol);
+
+			if (wtb->tria2.tot)
 				widget_trias_draw(&wtb->tria2);
-			}
 		
 			gpuTranslate(-jit[j][0], -jit[j][1], 0.0f);
 		}




More information about the Bf-blender-cvs mailing list