[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48331] branches/soc-2012-swiss_cheese/ source/blender/editors/space_view3d: No need to set the default value for PixelTransfer.

[Jason Wilkins]

Revision: 48331
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48331
Author:   jwilkins
Date:     2012-06-27 08:10:50 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
No need to set the default value for PixelTransfer.  PixelTransfer is 
deprecated so this is a start at actually eliminating all of the calls.

Modified Paths:
--------------
    
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawobject.c
    
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_draw.c

Modified: 
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- 
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawobject.c 
    2012-06-27 06:02:25 UTC (rev 48330)
+++ 
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawobject.c 
    2012-06-27 08:10:50 UTC (rev 48331)
@@ -652,7 +652,6 @@
 
                /* Draw the Image on the screen */
                glaDrawPixelsTex(ofs_x, ofs_y, ima_x, ima_y, GL_UNSIGNED_BYTE, 
ibuf->rect);
-               glPixelTransferf(GL_ALPHA_SCALE, 1.0f);
 
                glDisable(GL_BLEND);
        }

Modified: 
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- 
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_draw.c
    2012-06-27 06:02:25 UTC (rev 48330)
+++ 
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_draw.c
    2012-06-27 08:10:50 UTC (rev 48331)
@@ -1794,7 +1794,6 @@
                        glaDrawPixelsTex(x1, y1, ibuf->x, ibuf->y, 
GL_UNSIGNED_BYTE, ibuf->rect);
 
                        glPixelZoom(1.0, 1.0);
-                       glPixelTransferf(GL_ALPHA_SCALE, 1.0f);
 
                        glMatrixMode(GL_PROJECTION);
                        glPopMatrix();

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs