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

Kévin Dietrich noreply at git.blender.org
Sun Nov 13 21:44:39 CET 2016


Commit: 485911f3b59fe7f2468660c8c82a3cd9b234cf16
Author: Kévin Dietrich
Date:   Tue Jul 19 14:08:24 2016 +0200
Branches: openvdb
https://developer.blender.org/rB485911f3b59fe7f2468660c8c82a3cd9b234cf16

Merge branch 'master' into openvdb

Conflicts:
	intern/cycles/render/nodes.cpp

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



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

diff --cc intern/cycles/kernel/osl/osl_services.cpp
index 53034e9,2bb2be5..8d3f52d
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@@ -41,18 -45,9 +41,19 @@@
  #include "kernel_differential.h"
  #include "kernel_montecarlo.h"
  #include "kernel_camera.h"
 +
  #include "kernels/cpu/kernel_cpu_image.h"
 +
 +/* Note: "util_foreach.h" needs to be included after "kernel_compat_cpu.h", as
 + * for some reason ccl::foreach conflicts with openvdb::tools::foreach, which is
 + * indirectly included through "kernel_compat_cpu.h".
 + */
 +#include "util_foreach.h"
 +#include "util_logging.h"
 +#include "util_string.h"
 +
  #include "geom/geom.h"
+ #include "bvh/bvh.h"
  
  #include "kernel_projection.h"
  #include "kernel_accumulate.h"
diff --cc intern/cycles/render/nodes.cpp
index a2a7853,66c92bd..efc24aa
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@@ -22,7 -22,7 +22,8 @@@
  #include "svm_color_util.h"
  #include "svm_math_util.h"
  #include "osl.h"
+ #include "constant_fold.h"
 +#include "volume.h"
  
  #include "util_sky_model.h"
  #include "util_foreach.h"




More information about the Bf-blender-cvs mailing list