Cycles: svn merge -r37957:39132 https://svn.blender.org/svnroot/bf-blender/trunk/blender

source/blender/render/SConscript

@@ -14,6 +14,8 @@ cxxflags_raytrace = env['CXXFLAGS']
 defs = []
 defs_raytrace = []
 
+defs.append('WITH_SMOKE')  # TODO, make optional
+
 if env['WITH_BF_PYTHON']:
     incs += ' ../python'
     incs += ' ' + env['BF_PYTHON_INC']