[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48429] trunk/blender/source/blender/gpu/ intern/gpu_draw.c: GPU_upload_dxt_texture failed to compile if WITH_DDS was not defined

[Jason Wilkins]

Revision: 48429
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48429
Author:   jwilkins
Date:     2012-06-30 10:31:25 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
GPU_upload_dxt_texture failed to compile if WITH_DDS was not defined

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/intern/gpu_draw.c

Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c  2012-06-30 09:55:04 UTC 
(rev 48428)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c  2012-06-30 10:31:25 UTC 
(rev 48429)
@@ -707,6 +707,7 @@
  */
 int GPU_upload_dxt_texture(ImBuf *ibuf)
 {
+#if WITH_DDS
        GLint format, err;
        int blocksize, height, width, i, size, offset = 0;
 
@@ -747,6 +748,9 @@
        }
 
        return 1;
+#else
+    return 0;
+#endif
 }
 
 void GPU_create_gl_tex_compressed(unsigned int *bind, unsigned int *pix, int 
x, int y, int mipmap, Image *ima, ImBuf *ibuf)

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