Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-03-19 17:38:43 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-03-19 17:38:43 +0400
commitc9d981c86da7b3a580410a27afdec1e67f446a48 (patch)
tree1ac9e1fa16c3e2f3a4da4b7da1f6d255da2d591f
parent8c90d23462940c0577c87ccbd6792787b952e9d1 (diff)
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.
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index e27f00de748..30a6932c60e 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1819,7 +1819,12 @@ static void view3d_draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d,
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);