Index: tools/btools.py
===================================================================
--- tools/btools.py	(revision 10936)
+++ tools/btools.py	(working copy)
@@ -29,6 +29,7 @@
             'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_LIBPATH',
             'WITH_BF_FMOD',
             'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH',
+            'WITH_BF_DDS',
             'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB', 'BF_FFMPEG',  'BF_FFMPEG_INC',
             'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH',
             'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH',
@@ -162,6 +163,8 @@
         ('BF_OPENEXR_LIB', 'OPENEXR library', ''),
         ('BF_OPENEXR_LIBPATH', 'OPENEXR library path', ''),
 
+        (BoolOption('WITH_BF_DDS', 'Use DDS if true', 'true')),
+
         (BoolOption('WITH_BF_FFMPEG', 'Use FFMPEG if true', 'false')),
         ('BF_FFMPEG', 'FFMPEG base path', ''),
         ('BF_FFMPEG_LIB', 'FFMPEG library', ''),
Index: source/blender/render/SConscript
===================================================================
--- source/blender/render/SConscript	(revision 10936)
+++ source/blender/render/SConscript	(working copy)
@@ -25,6 +25,9 @@
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
 
+if env['WITH_BF_DDS']:
+    defs.append('WITH_DDS')
+
 if env['OURPLATFORM']=='linux2':
     cflags='-pthread'
 
Index: source/blender/blenkernel/intern/image.c
===================================================================
--- source/blender/blenkernel/intern/image.c	(revision 10936)
+++ source/blender/blenkernel/intern/image.c	(working copy)
@@ -633,6 +633,10 @@
 		return RADHDR;
 	else if (imtype==R_PNG)
 		return PNG;
+#ifdef WITH_DDS
+	else if (imtype==R_DDS)
+		return DDS;
+#endif
 	else if (imtype==R_BMP)
 		return BMP;
 	else if (imtype==R_TIFF)
@@ -663,6 +667,10 @@
 		return R_RADHDR;
 	else if (ftype & PNG)
 		return R_PNG;
+#ifdef WITH_DDS
+	else if (ftype & DDS)
+		return R_DDS;
+#endif
 	else if (ftype & BMP)
 		return R_BMP;
 	else if (ftype & TIF)
@@ -719,6 +727,12 @@
 		if(!BLI_testextensie(string, ".png"))
 			extension= ".png";
 	}
+#ifdef WITH_DDS
+	else if(imtype==R_DDS) {
+		if(!BLI_testextensie(string, ".dds"))
+			extension= ".dds";
+	}
+#endif
 	else if(imtype==R_RAWTGA) {
 		if(!BLI_testextensie(string, ".tga"))
 			extension= ".tga";
@@ -771,6 +785,11 @@
 	else if ((imtype==R_PNG)) {
 		ibuf->ftype= PNG;
 	}
+#ifdef WITH_DDS
+	else if ((imtype==R_DDS)) {
+		ibuf->ftype= DDS;
+	}
+#endif
 	else if ((imtype==R_BMP)) {
 		ibuf->ftype= BMP;
 	}
Index: source/blender/blenkernel/SConscript
===================================================================
--- source/blender/blenkernel/SConscript	(revision 10936)
+++ source/blender/blenkernel/SConscript	(working copy)
@@ -27,6 +27,9 @@
 if env['WITH_BF_OPENEXR'] == 1:
     defs += ' WITH_OPENEXR'
 
+if env['WITH_BF_DDS'] == 1:
+    defs += ' WITH_DDS'
+
 if env['WITH_BF_FFMPEG'] == 1:
     defs += ' WITH_FFMPEG'
     incs += ' ' + env['BF_FFMPEG_INC']
Index: source/blender/python/SConscript
===================================================================
--- source/blender/python/SConscript	(revision 10936)
+++ source/blender/python/SConscript	(working copy)
@@ -20,4 +20,7 @@
 if env['WITH_BF_OPENEXR'] == 1:
     defs.append('WITH_OPENEXR')
 
+if env['WITH_BF_DDS'] == 1:
+    defs.append('WITH_DDS')
+
 env.BlenderLib ( libname='blender_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype=['core','game2'], priority = [60,115] )
Index: source/blender/makesdna/DNA_scene_types.h
===================================================================
--- source/blender/makesdna/DNA_scene_types.h	(revision 10936)
+++ source/blender/makesdna/DNA_scene_types.h	(working copy)
@@ -552,6 +552,7 @@
 #define R_CINEON		26
 #define R_DPX			27
 #define R_MULTILAYER	28
+#define R_DDS			29
 
 /* subimtype, flag options for imtype */
 #define R_OPENEXR_HALF	1
Index: source/blender/src/writeimage.c
===================================================================
--- source/blender/src/writeimage.c	(revision 10936)
+++ source/blender/src/writeimage.c	(working copy)
@@ -151,6 +151,11 @@
 		case R_PNG:
 			strcpy(str, "Save PNG");
 			break;
+#ifdef WITH_DDS
+		case R_DDS:
+			strcpy(str, "Save DDS");
+			break;
+#endif
 		case R_BMP:
 			strcpy(str, "Save BMP");
 			break;
Index: source/blender/src/SConscript
===================================================================
--- source/blender/src/SConscript	(revision 10936)
+++ source/blender/src/SConscript	(working copy)
@@ -35,6 +35,9 @@
 if env['WITH_BF_OPENEXR'] == 1:
     defs.append('WITH_OPENEXR')
 
+if env['WITH_BF_DDS'] == 1:
+    defs.append('WITH_DDS')
+
 if env['WITH_BF_QUICKTIME']==1:
     incs += ' ' + env['BF_QUICKTIME_INC']
     defs.append('WITH_QUICKTIME')
Index: source/blender/src/filesel.c
===================================================================
--- source/blender/src/filesel.c	(revision 10936)
+++ source/blender/src/filesel.c	(working copy)
@@ -535,6 +535,9 @@
 					||	BLI_testextensie(file->relname, ".rgb")
 					||	BLI_testextensie(file->relname, ".bmp")
 					||	BLI_testextensie(file->relname, ".png")
+#ifdef WITH_DDS
+					||	BLI_testextensie(file->relname, ".dds")
+#endif
 					||	BLI_testextensie(file->relname, ".iff")
 					||	BLI_testextensie(file->relname, ".lbm")
 					||	BLI_testextensie(file->relname, ".gif")
@@ -566,6 +569,9 @@
 					||	BLI_testextensie(file->relname, ".rgb")
 					||	BLI_testextensie(file->relname, ".bmp")
 					||	BLI_testextensie(file->relname, ".png")
+#ifdef WITH_DDS
+					||	BLI_testextensie(file->relname, ".dds")
+#endif
 					||	BLI_testextensie(file->relname, ".iff")
 					||	BLI_testextensie(file->relname, ".lbm")
 					||  BLI_testextensie(file->relname, ".cin")
Index: source/blender/src/buttons_scene.c
===================================================================
--- source/blender/src/buttons_scene.c	(revision 10936)
+++ source/blender/src/buttons_scene.c	(working copy)
@@ -1041,6 +1041,9 @@
 #endif
 
 	strcat(formatstring, "|%s %%x%d");	// add space for PNG
+#ifdef WITH_DDS
+	strcat(formatstring, "|%s %%x%d");	// add space for DDS
+#endif
 	strcat(formatstring, "|%s %%x%d");	// add space for BMP
 	strcat(formatstring, "|%s %%x%d");	// add space for Radiance HDR
 	strcat(formatstring, "|%s %%x%d");	// add space for Cineon
@@ -1077,6 +1080,9 @@
 			"Targa",          R_TARGA,
 			"Targa Raw",      R_RAWTGA,
 			"PNG",            R_PNG,
+#ifdef WITH_DDS
+			"DDS",            R_DDS,
+#endif
 			"BMP",            R_BMP,
 			"Jpeg",           R_JPEG90,
 			"HamX",           R_HAMX,
@@ -1102,6 +1108,9 @@
 			"Targa",          R_TARGA,
 			"Targa Raw",      R_RAWTGA,
 			"PNG",            R_PNG,
+#ifdef WITH_DDS
+			"DDS",            R_DDS,
+#endif
 			"BMP",            R_BMP,
 			"Jpeg",           R_JPEG90,
 			"HamX",           R_HAMX,
Index: source/blender/imbuf/intern/IMB_dds.h
===================================================================
--- source/blender/imbuf/intern/IMB_dds.h	(revision 0)
+++ source/blender/imbuf/intern/IMB_dds.h	(revision 0)
@@ -0,0 +1,51 @@
+/*
+ * IMB_dds.h
+ *
+ * $Id$
+ *
+ * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. The Blender
+ * Foundation also sells licenses for use in proprietary software under
+ * the Blender License.  See http://www.blender.org/BL/ for information
+ * about this.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ */
+/**
+ * \file IMB_dds.h
+ * \ingroup imbuf
+ * \brief Function declarations for dds.c
+ */
+
+#ifndef IMB_DDS_H
+#define IMB_DDS_H
+
+struct ImBuf;
+
+int imb_is_a_dds(void *buf);
+
+struct ImBuf *imb_loaddds(unsigned char *mem, int flags);
+short imb_savedds(struct ImBuf * ibuf, char *name, int flags);
+
+#endif
+

Property changes on: source/blender/imbuf/intern/IMB_dds.h
___________________________________________________________________
Name: svn:eol-style
   + native

Index: source/blender/imbuf/intern/dds.c
===================================================================
--- source/blender/imbuf/intern/dds.c	(revision 0)
+++ source/blender/imbuf/intern/dds.c	(revision 0)
@@ -0,0 +1,230 @@
+/**
+ *
+ * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. The Blender
+ * Foundation also sells licenses for use in proprietary software under
+ * the Blender License.  See http://www.blender.org/BL/ for information
+ * about this.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ * $Id$
+ */
+
+/*
+
+The marked parts below are taken from the NVIDIA Texture Tools. Here's the licence for that
+code:
+
+The NVIDIA Texture Tools are licensed under the MIT license.
+
+Copyright (c) 2007 NVIDIA Corporation
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifdef WIN32
+#include <io.h>
+#endif
+#include "BLI_blenlib.h"
+
+#include "imbuf.h"
+#include "imbuf_patch.h"
+
+#include "IMB_imbuf_types.h"
+#include "IMB_imbuf.h"
+
+#include "IMB_allocimbuf.h"
+#include "IMB_cmap.h"
+#include "IMB_dds.h"
+
+/******************************************************************************
+ * copied & pasted & modified from NVIDIA Texture Tools
+ */
+
+#if !defined(MAKEFOURCC)
+#	define MAKEFOURCC(ch0, ch1, ch2, ch3) \
+		(unsigned int(char(ch0)) | (unsigned int(char(ch1)) << 8) | \
+		(unsigned int(char(ch2)) << 16) | (unsigned int(char(ch3)) << 24 ))
+#endif
+
+static const unsigned int FOURCC_DDS = MAKEFOURCC('D', 'D', 'S', ' ');
+static const unsigned int FOURCC_DXT1 = MAKEFOURCC('D', 'X', 'T', '1');
+static const unsigned int FOURCC_DXT2 = MAKEFOURCC('D', 'X', 'T', '2');
+static const unsigned int FOURCC_DXT3 = MAKEFOURCC('D', 'X', 'T', '3');
+static const unsigned int FOURCC_DXT4 = MAKEFOURCC('D', 'X', 'T', '4');
+static const unsigned int FOURCC_DXT5 = MAKEFOURCC('D', 'X', 'T', '5');
+static const unsigned int FOURCC_RXGB = MAKEFOURCC('R', 'X', 'G', 'B');
+static const unsigned int FOURCC_ATI1 = MAKEFOURCC('A', 'T', 'I', '1');
+static const unsigned int FOURCC_ATI2 = MAKEFOURCC('A', 'T', 'I', '2');
+
+/* RGB formats. */
+static const unsigned int D3DFMT_R8G8B8 = 20;
+static const unsigned int D3DFMT_A8R8G8B8 = 21;
+static const unsigned int D3DFMT_X8R8G8B8 = 22;
+static const unsigned int D3DFMT_R5G6B5 = 23;
+static const unsigned int D3DFMT_X1R5G5B5 = 24;
+static const unsigned int D3DFMT_A1R5G5B5 = 25;
+static const unsigned int D3DFMT_A4R4G4B4 = 26;
+static const unsigned int D3DFMT_R3G3B2 = 27;
+static const unsigned int D3DFMT_A8 = 28;
+static const unsigned int D3DFMT_A8R3G3B2 = 29;
+static const unsigned int D3DFMT_X4R4G4B4 = 30;
+static const unsigned int D3DFMT_A2B10G10R10 = 31;
+static const unsigned int D3DFMT_A8B8G8R8 = 32;
+static const unsigned int D3DFMT_X8B8G8R8 = 33;
+static const unsigned int D3DFMT_G16R16 = 34;
+static const unsigned int D3DFMT_A2R10G10B10 = 35;
+static const unsigned int D3DFMT_A16B16G16R16 = 36;
+
+/* Palette formats. */
+static const unsigned int D3DFMT_A8P8 = 40;
+static const unsigned int D3DFMT_P8 = 41;
+
+/* Luminance formats. */
+static const unsigned int D3DFMT_L8 = 50;
+static const unsigned int D3DFMT_A8L8 = 51;
+static const unsigned int D3DFMT_A4L4 = 52;
+
+/* Floating point formats */
+static const unsigned int D3DFMT_R16F = 111;
+static const unsigned int D3DFMT_G16R16F = 112;
+static const unsigned int D3DFMT_A16B16G16R16F = 113;
+static const unsigned int D3DFMT_R32F = 114;
+static const unsigned int D3DFMT_G32R32F = 115;
+static const unsigned int D3DFMT_A32B32G32R32F = 116;
+
+static const unsigned int DDSD_CAPS = 0x00000001U;
+static const unsigned int DDSD_PIXELFORMAT = 0x00001000U;
+static const unsigned int DDSD_WIDTH = 0x00000004U;
+static const unsigned int DDSD_HEIGHT = 0x00000002U;
+static const unsigned int DDSD_PITCH = 0x00000008U;
+static const unsigned int DDSD_MIPMAPCOUNT = 0x00020000U;
+static const unsigned int DDSD_LINEARSIZE = 0x00080000U;
+static const unsigned int DDSD_DEPTH = 0x00800000U;
+
+static const unsigned int DDSCAPS_COMPLEX = 0x00000008U;
+static const unsigned int DDSCAPS_TEXTURE = 0x00001000U;
+static const unsigned int DDSCAPS_MIPMAP = 0x00400000U;
+static const unsigned int DDSCAPS2_VOLUME = 0x00200000U;
+static const unsigned int DDSCAPS2_CUBEMAP = 0x00000200U;
+
+static const unsigned int DDSCAPS2_CUBEMAP_POSITIVEX = 0x00000400U;
+static const unsigned int DDSCAPS2_CUBEMAP_NEGATIVEX = 0x00000800U;
+static const unsigned int DDSCAPS2_CUBEMAP_POSITIVEY = 0x00001000U;
+static const unsigned int DDSCAPS2_CUBEMAP_NEGATIVEY = 0x00002000U;
+static const unsigned int DDSCAPS2_CUBEMAP_POSITIVEZ = 0x00004000U;
+static const unsigned int DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x00008000U;
+static const unsigned int DDSCAPS2_CUBEMAP_ALL_FACES = 0x0000FC00U;
+
+static const unsigned int DDPF_ALPHAPIXELS = 0x00000001U;
+static const unsigned int DDPF_ALPHA = 0x00000002U;
+static const unsigned int DDPF_FOURCC = 0x00000004U;
+static const unsigned int DDPF_RGB = 0x00000040U;
+static const unsigned int DDPF_PALETTEINDEXED1 = 0x00000800U;
+static const unsigned int DDPF_PALETTEINDEXED2 = 0x00001000U;
+static const unsigned int DDPF_PALETTEINDEXED4 = 0x00000008U;
+static const unsigned int DDPF_PALETTEINDEXED8 = 0x00000020U;
+static const unsigned int DDPF_LUMINANCE = 0x00020000U;
+static const unsigned int DDPF_ALPHAPREMULT = 0x00008000U;
+static const unsigned int DDPF_NORMAL = 0x80000000U;	// @@ Custom nv flag.
+
+typedef struct DDSPixelFormat
+{
+	unsigned int size;
+	unsigned int flags;
+	unsigned int fourcc;
+	unsigned int bitcount;
+	unsigned int rmask;
+	unsigned int gmask;
+	unsigned int bmask;
+	unsigned int amask;
+} DDSPixelFormat;
+
+typedef struct DDSCaps
+{
+	unsigned int caps1;
+	unsigned int caps2;
+	unsigned int caps3;
+	unsigned int caps4;
+} DDSCaps;
+
+typedef struct DDSHeader
+{
+	unsigned int fourcc;
+	unsigned int size;
+	unsigned int flags;
+	unsigned int height;
+	unsigned int width;
+	unsigned int pitch;
+	unsigned int depth;
+	unsigned int mipmapcount;
+	unsigned int reserved[11];
+	DDSPixelFormat pf;
+	DDSCaps caps;
+	unsigned int notused;
+} DDSHeader;
+
+static int isValidDDS()
+{
+	return(0);
+}
+
+static int isSupportedDDS()
+{
+	return(0);
+}
+
+/******************************************************************************
+ * non-NVIDIA code
+ */
+
+short imb_savedds(struct ImBuf * ibuf, char *name, int flags)
+{
+	return(0);
+}
+
+int imb_is_a_dds(void *buf)
+{
+	DDSHeader dds;
+	return isSupportedDDS(&dds, buf);
+}
+
+struct ImBuf *imb_loaddds(unsigned char *mem, int flags)
+{
+	DIRECTDRAWSURFACE dds;
+	struct ImBuf * ibuf;
+	return(0);
+	/* return(ibuf); */
+}

Property changes on: source/blender/imbuf/intern/dds.c
___________________________________________________________________
Name: svn:eol-style
   + native

Index: source/blender/imbuf/intern/util.c
===================================================================
--- source/blender/imbuf/intern/util.c	(revision 10936)
+++ source/blender/imbuf/intern/util.c	(working copy)
@@ -44,6 +44,11 @@
 
 #include "IMB_targa.h"
 #include "IMB_png.h"
+
+#ifdef WITH_DDS
+#include "IMB_dds.h"
+#endif
+
 #include "IMB_bmp.h"
 #include "IMB_tiff.h"
 #include "IMB_radiance_hdr.h"
@@ -113,6 +118,9 @@
 
 				}
 				if (imb_is_a_png(buf)) return(PNG);
+#ifdef WITH_DDS
+				if (imb_is_a_dds(buf)) return(DDS);
+#endif
 				if (imb_is_a_targa(buf)) return(TGA);
 #ifdef WITH_OPENEXR
 				if (imb_is_a_openexr((uchar *)buf)) return(OPENEXR);
@@ -162,6 +170,9 @@
 				||	BLI_testextensie(filename, ".rgb")
 				||	BLI_testextensie(filename, ".bmp")
 				||	BLI_testextensie(filename, ".png")
+#ifdef WITH_DDS
+				||	BLI_testextensie(filename, ".dds")
+#endif
 				||	BLI_testextensie(filename, ".iff")
 				||	BLI_testextensie(filename, ".lbm")
 				||	BLI_testextensie(filename, ".gif")
@@ -188,6 +199,9 @@
 				||	BLI_testextensie(filename, ".bmp")
 				||	BLI_testextensie(filename, ".png")
 				||	BLI_testextensie(filename, ".cin")
+#ifdef WITH_DDS
+				||	BLI_testextensie(filename, ".dds")
+#endif
 #ifdef WITH_BF_OPENEXR
 				||	BLI_testextensie(filename, ".exr")
 #endif
@@ -251,6 +265,7 @@
 	if( BLI_testextensie(filename, ".swf") ||
 		BLI_testextensie(filename, ".jpg") ||
 		BLI_testextensie(filename, ".png") ||
+		BLI_testextensie(filename, ".dds") ||
 		BLI_testextensie(filename, ".tga") ||
 		BLI_testextensie(filename, ".bmp") ||
 		BLI_testextensie(filename, ".exr") ||
Index: source/blender/imbuf/IMB_imbuf_types.h
===================================================================
--- source/blender/imbuf/IMB_imbuf_types.h	(revision 10936)
+++ source/blender/imbuf/IMB_imbuf_types.h	(working copy)
@@ -174,6 +174,10 @@
 #define CINEON			(1 << 21)
 #define DPX				(1 << 20)
 
+#ifdef WITH_DDS
+#define DDS				(1 << 19)
+#endif
+
 #define RAWTGA	        (TGA | 1)
 
 #define JPG_STD	        (JPG | (0 << 8))
@@ -216,6 +220,10 @@
 #define IS_tiff(x)		(x->ftype & TIF)
 #define IS_radhdr(x)	(x->ftype & RADHDR)
 
+#ifdef WITH_DDS
+#define IS_dds(x)		(x->ftype & DDS)
+#endif
+
 #define IMAGIC 	0732
 #define IS_iris(x)		(x->ftype == IMAGIC)
 
Index: source/blender/imbuf/SConscript
===================================================================
--- source/blender/imbuf/SConscript	(revision 10936)
+++ source/blender/imbuf/SConscript	(working copy)
@@ -20,6 +20,9 @@
 if env['WITH_BF_OPENEXR'] == 1:
     defs.append('WITH_OPENEXR')
 
+if env['WITH_BF_DDS'] == 1:
+    defs.append('WITH_DDS')
+
 if env['WITH_BF_FFMPEG'] == 1:
     defs.append('WITH_FFMPEG')
     incs += ' ' + env['BF_FFMPEG_INC']
Index: source/blender/nodes/SConscript
===================================================================
--- source/blender/nodes/SConscript	(revision 10936)
+++ source/blender/nodes/SConscript	(working copy)
@@ -33,6 +33,9 @@
 if env['WITH_BF_OPENEXR'] == 1:
     defs += ' WITH_OPENEXR'
 
+if env['WITH_BF_DDS'] == 1:
+    defs += ' WITH_DDS'
+
 if env['WITH_BF_FFMPEG'] == 1:
     defs += ' WITH_FFMPEG'
     incs += ' ' + env['BF_FFMPEG_INC']
Index: config/win32-vc-config.py
===================================================================
--- config/win32-vc-config.py	(revision 10936)
+++ config/win32-vc-config.py	(working copy)
@@ -50,6 +50,8 @@
 BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_msvc'
 
+WITH_BF_DDS = 'true'
+
 WITH_BF_JPEG = 'true'
 BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'
Index: config/linuxcross-config.py
===================================================================
--- config/linuxcross-config.py	(revision 10936)
+++ config/linuxcross-config.py	(working copy)
@@ -39,6 +39,8 @@
 BF_OPENEXR_LIB = ' Half IlmImf Iex '
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 
+WITH_BF_DDS = 'true'
+
 WITH_BF_JPEG = 'true'
 BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'
Index: config/sunos5-config.py
===================================================================
--- config/sunos5-config.py	(revision 10936)
+++ config/sunos5-config.py	(working copy)
@@ -29,6 +29,8 @@
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
 
+WITH_BF_DDS = 'true'
+
 WITH_BF_JPEG = 'true'
 BF_JPEG = '/usr/local'
 BF_JPEG_INC = '${BF_JPEG}/include'
Index: config/openbsd3-config.py
===================================================================
--- config/openbsd3-config.py	(revision 10936)
+++ config/openbsd3-config.py	(working copy)
@@ -28,6 +28,8 @@
 BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
 
+WITH_BF_DDS = 'true'
+
 WITH_BF_JPEG = 'true'
 BF_JPEG = '/usr/local'
 BF_JPEG_INC = '${BF_JPEG}/include'
Index: config/linux2-config.py
===================================================================
--- config/linux2-config.py	(revision 10936)
+++ config/linux2-config.py	(working copy)
@@ -32,6 +32,8 @@
 BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
 
+WITH_BF_DDS = 'true'
+
 WITH_BF_JPEG = 'true'
 BF_JPEG = '/usr'
 BF_JPEG_INC = '${BF_JPEG}/include'
Index: config/win32-mingw-config.py
===================================================================
--- config/win32-mingw-config.py	(revision 10936)
+++ config/win32-mingw-config.py	(working copy)
@@ -42,6 +42,8 @@
 BF_OPENEXR_LIB = ' Half IlmImf Iex '
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 
+WITH_BF_DDS = 'true'
+
 WITH_BF_JPEG = 'true'
 BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'
Index: config/darwin-config.py
===================================================================
--- config/darwin-config.py	(revision 10936)
+++ config/darwin-config.py	(working copy)
@@ -52,6 +52,7 @@
 BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
 
+WITH_BF_DDS = 'true'
 
 WITH_BF_JPEG = 'true'
 BF_JPEG = LIBDIR + '/jpeg'