[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34579] trunk/blender/source/blender/ editors: Changed alpha blending mode for image editor and node previews.

[Lukas Toenne]

Revision: 34579
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34579
Author:   lukastoenne
Date:     2011-01-31 11:57:37 +0000 (Mon, 31 Jan 2011)
Log Message:
-----------
Changed alpha blending mode for image editor and node previews. This was using the sum of the image and alpha-faded background, leading to almost-white transparent areas. New code uses correct GL_SRC_ALPHA for the source image.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/image_draw.c
    trunk/blender/source/blender/editors/space_node/node_draw.c

Modified: trunk/blender/source/blender/editors/space_image/image_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_draw.c	2011-01-31 11:19:23 UTC (rev 34578)
+++ trunk/blender/source/blender/editors/space_image/image_draw.c	2011-01-31 11:57:37 UTC (rev 34579)
@@ -390,7 +390,7 @@
 			sima_draw_alpha_backdrop(x, y, ibuf->x, ibuf->y, zoomx, zoomy, col1, col2);
 
 			glEnable(GL_BLEND);
-			glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 		}
 
 		/* we don't draw floats buffers directly but

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c	2011-01-31 11:19:23 UTC (rev 34578)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c	2011-01-31 11:57:37 UTC (rev 34579)
@@ -616,12 +616,11 @@
 	glPixelZoom(xscale, yscale);
 
 	glEnable(GL_BLEND);
-	glBlendFunc( GL_ONE, GL_ONE_MINUS_SRC_ALPHA );	/* premul graphics */
+	glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );	/* premul graphics */
 	
 	glColor4f(1.0, 1.0, 1.0, 1.0);
 	glaDrawPixelsTex(prv->xmin, prv->ymin, preview->xsize, preview->ysize, GL_UNSIGNED_BYTE, preview->rect);
 	
-	glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
 	glDisable(GL_BLEND);
 	glPixelZoom(1.0f, 1.0f);