[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55415] trunk/blender/source/blender/ editors/space_view3d/view3d_draw.c: Fix regression in viewport background image transparency

[Sergey Sharybin]

Revision: 55415
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55415
Author:   nazgul
Date:     2013-03-19 13:38:43 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------
Fix regression in viewport background image transparency

Was caused by recent changes to automatically switch between
glaDrawPixelsTex and glaDrawPixelsSafe depending on resolution.

glaDrawPixelsSafe could not be sued for viewport because it'll
miss alpha transparency.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2013-03-19 13:32:57 UTC (rev 55414)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2013-03-19 13:38:43 UTC (rev 55415)
@@ -1819,8 +1819,13 @@
 
 			glPixelZoom(zoomx, zoomy);
 			glColor4f(1.0f, 1.0f, 1.0f, 1.0f - bgpic->blend);
-			glaDrawPixelsAuto(x1, y1, ibuf->x, ibuf->y, GL_UNSIGNED_BYTE, GL_LINEAR, ibuf->rect);
 
+			/* could not use glaDrawPixelsAuto because it could fallback to
+			 * glaDrawPixelsSafe in some cases, which will end up in misssing
+			 * alpha transparency for the background image (sergey)
+			 */
+			glaDrawPixelsTex(x1, y1, ibuf->x, ibuf->y, GL_UNSIGNED_BYTE, GL_NEAREST, ibuf->rect);
+
 			glPixelZoom(1.0, 1.0);
 			glPixelTransferf(GL_ALPHA_SCALE, 1.0f);