[Bf-blender-cvs] [a7b4e8a] openvdb: Merge branch 'master' into openvdb

[Kévin Dietrich]

Commit: a7b4e8a75c0c6f2d111cf4f753dccbce6614e504
Author: Kévin Dietrich
Date:   Tue Jul 28 15:48:46 2015 +0200
Branches: openvdb
https://developer.blender.org/rBa7b4e8a75c0c6f2d111cf4f753dccbce6614e504

Merge branch 'master' into openvdb

===================================================================



===================================================================

diff --cc source/blender/nodes/CMakeLists.txt
index 2be79bc,13dede8..2c91807
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -289,12 -288,8 +289,16 @@@ if(WITH_FREESTYLE
  	add_definitions(-DWITH_FREESTYLE)
  endif()
  
+ if(WITH_CYCLES AND WITH_CYCLES_DEBUG)
+ 	add_definitions(-DWITH_CYCLES_DEBUG)
+ endif()
+ 
 +if(WITH_OPENVDB)
 +	add_definitions(-DWITH_OPENVDB)
 +	add_definitions(-DOPENVDB_USE_BLOSC)
 +	list(APPEND INC
 +	     ../../../intern/openvdb
 +	)
 +endif()
 +
  blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}")
diff --cc source/blender/nodes/SConscript
index a41be4b,9c2cc82..7a3ed4e
--- a/source/blender/nodes/SConscript
+++ b/source/blender/nodes/SConscript
@@@ -75,10 -75,9 +75,13 @@@ if env['WITH_BF_COMPOSITOR']
  if env['WITH_BF_FREESTYLE']:
      defs.append('WITH_FREESTYLE')
  
+ if env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_DEBUG']:
+     defs.append('WITH_CYCLES_DEBUG')
+ 
 +if env['WITH_BF_OPENVDB']:
 +    defs.append('WITH_OPENVDB')
 +    incs += ' #/intern/openvdb'
 +
  env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [190,105] )
  env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
  env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )