[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12030] trunk/blender/source/blender/src: This is patch [#6772] Background image drawing speedup

[Kent Mein]

Revision: 12030
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12030
Author:   sirdude
Date:     2007-09-13 16:33:21 +0200 (Thu, 13 Sep 2007)

Log Message:
-----------
This is patch [#6772] Background image drawing speedup
Thanks goto Matthew Plough (meestaplu)

I've tested it on linux with both an nvidia and an ATI card,
I've also tested it on a mac and solaris, as well as through a
remote display.  So I think this one is pretty safe.  
If it causes problems on older systems we can revert it
but I don't think we will have any issues with it.

Kent

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawnode.c
    trunk/blender/source/blender/src/drawview.c

Modified: trunk/blender/source/blender/src/drawnode.c
===================================================================
--- trunk/blender/source/blender/src/drawnode.c	2007-09-13 06:08:43 UTC (rev 12029)
+++ trunk/blender/source/blender/src/drawnode.c	2007-09-13 14:33:21 UTC (rev 12030)
@@ -1869,6 +1869,7 @@
 	glEnable(GL_BLEND);
 	glBlendFunc( GL_ONE, 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_FLOAT, preview->rect);
 	
 	glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );

Modified: trunk/blender/source/blender/src/drawview.c
===================================================================
--- trunk/blender/source/blender/src/drawview.c	2007-09-13 06:08:43 UTC (rev 12029)
+++ trunk/blender/source/blender/src/drawview.c	2007-09-13 14:33:21 UTC (rev 12030)
@@ -436,10 +436,13 @@
 	glPushMatrix();
 	
 	glaDefine2DArea(&curarea->winrct);
+
 	glEnable(GL_BLEND);
-	glPixelTransferf(GL_ALPHA_SCALE, (1.0f-bgpic->blend));
+
 	glPixelZoom(zoomx, zoomy);
-	glaDrawPixelsSafe(x1, y1, ibuf->x, ibuf->y, ibuf->x, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);
+	glColor4f(1.0, 1.0, 1.0, 1.0-bgpic->blend);
+	glaDrawPixelsTex(x1, y1, ibuf->x, ibuf->y, GL_UNSIGNED_BYTE, ibuf->rect);
+	
 	glPixelZoom(1.0, 1.0);
 	glPixelTransferf(GL_ALPHA_SCALE, 1.0f);