svn merge -r38300:38400 https://svn.blender.org/svnroot/bf-blender/trunk/blender

3 files changed, 14 insertions, 1 deletions

diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index a2d698b739e..003f0b839f8 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -120,6 +120,10 @@ if(WITH_IMAGE_OPENEXR)
 	add_definitions(-DWITH_OPENEXR)
 endif()
 
+if(WITH_MOD_SMOKE)
+	add_definitions(-DWITH_SMOKE)
+endif()
+
 if(WITH_CODEC_QUICKTIME)
 	list(APPEND INC ../quicktime)
 	list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index 03819f034eb..1214912019d 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -14,6 +14,8 @@ cxxflags_raytrace = env['CXXFLAGS']
 defs = []
 defs_raytrace = []
 
+defs.append('WITH_SMOKE')  # TODO, make optional
+
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
     if env['WITH_BF_RAYOPTIMIZATION']:
         cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index b8cb5c21337..232f7fdeede 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -220,6 +220,7 @@ static int read_voxeldata_header(FILE *fp, struct VoxelData *vd)
 
 static void init_frame_smoke(VoxelData *vd, float cfra)
 {
+#ifdef WITH_SMOKE
 	Object *ob;
 	ModifierData *md;
 	
@@ -300,7 +301,13 @@ static void init_frame_smoke(VoxelData *vd, float cfra)
 	}
 	
 	vd->ok = 1;
-	return;
+
+#else // WITH_SMOKE
+	(void)vd;
+	(void)cfra;
+
+	vd->dataset= NULL;
+#endif
 }
 
 static void cache_voxeldata(struct Render *re, Tex *tex)