[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20730] branches/blender2.5/blender/source /blender/editors/interface/interface_widgets.c: 2.5

[Ton Roosendaal]

Revision: 20730
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20730
Author:   ton
Date:     2009-06-08 13:27:40 +0200 (Mon, 08 Jun 2009)

Log Message:
-----------
2.5

Test commit: different treatment of drawing alpha mask...

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c	2009-06-08 11:11:39 UTC (rev 20729)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c	2009-06-08 11:27:40 UTC (rev 20730)
@@ -546,10 +546,6 @@
 	if(wtb->inner) {
 		if(wcol->shaded==0) {
 			
-			/* this is to enable drawing zero alpha masks */
-			if(wcol->inner[3]==0)
-				glDisable(GL_BLEND);
-			
 			/* filled center, solid */
 			glColor4ubv(wcol->inner);
 			glBegin(GL_POLYGON);
@@ -557,8 +553,6 @@
 				glVertex2fv(wtb->inner_v[a]);
 			glEnd();
 
-			if(wcol->inner[3]==0)
-				glEnable(GL_BLEND);
 		}
 		else {
 			char col1[4], col2[4];
@@ -1625,6 +1619,7 @@
 	wcol->inner[0]= wcol->inner[1]= wcol->inner[2]= wcol->inner[3]= 0;
 	wtb.outline= 0;
 	round_box_edges(&wtb, 15, rect, 5.0f);
+	glBlendFunc(GL_ONE, GL_ZERO);
 	widgetbase_draw(&wtb, wcol);
 	
 	if(but->block->drawextra) {
@@ -1636,6 +1631,9 @@
 		glDisable(GL_BLEND);
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	}
+	
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	
 	/* outline */
 	wtb.outline= 1;
 	wtb.inner= 0;