[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48666] branches/soc-2012-swiss_cheese/ source/blender/gpu/intern/gpu_draw.c: Cast both results of a tertiary expression so that they are the same type.

[Jason Wilkins]

Revision: 48666
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48666
Author:   jwilkins
Date:     2012-07-05 22:44:54 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Cast both results of a tertiary expression so that they are the same type.

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_draw.c

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_draw.c 
2012-07-05 22:43:21 UTC (rev 48665)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_draw.c 
2012-07-05 22:44:54 UTC (rev 48666)
@@ -764,7 +764,7 @@
        }
        else {
        
-               GenerateMipmapRGBA(use_high_bit_depth, rectw, recth, 
use_high_bit_depth?frect: pix);
+               GenerateMipmapRGBA(use_high_bit_depth, rectw, recth, 
use_high_bit_depth? (void*)frect: (void*)pix);
 
                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, 
gpu_get_mipmap_filter(0));
                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, 
gpu_get_mipmap_filter(1));

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