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

[Kévin Dietrich]

Commit: 786e81fd18d1d151e43957933b6b69683f794b37
Author: Kévin Dietrich
Date:   Thu Jan 14 23:34:42 2016 +0100
Branches: openvdb
https://developer.blender.org/rB786e81fd18d1d151e43957933b6b69683f794b37

Merge branch 'master' into openvdb

Conflicts:
	intern/cycles/CMakeLists.txt

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



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

diff --cc intern/cycles/CMakeLists.txt
index 1a74324,6d1c6bf..6969ea3
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@@ -151,22 -143,13 +143,23 @@@ if(WITH_CYCLES_OSL
  	)
  endif()
  
 +if(WITH_OPENVDB)
 +	add_definitions(-DWITH_OPENVDB)
 +	add_definitions(-DDWREAL_IS_DOUBLE=0)
 +	add_definitions(-DTBB_USE_EXCEPTIONS=0)
 +	include_directories(
 +		${OPENVDB_INCLUDE_DIRS}
 +	)
 +endif()
 +
- add_definitions(
- 	-DWITH_OPENCL
- 	-DWITH_CUDA
- 	-DWITH_MULTI
- )
+ set(WITH_CYCLES_DEVICE_OPENCL TRUE)
+ set(WITH_CYCLES_DEVICE_CUDA TRUE)
+ set(WITH_CYCLES_DEVICE_MULTI TRUE)
  
- TEST_UNORDERED_MAP_SUPPORT()
++
+ if(CYCLES_STANDALONE_REPOSITORY)
+ 	TEST_UNORDERED_MAP_SUPPORT()
+ endif()
  if(HAVE_STD_UNORDERED_MAP_HEADER)
  	if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE)
  		add_definitions(-DCYCLES_STD_UNORDERED_MAP)