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

[Kévin Dietrich]

Commit: 6a595bfa66fc5274263887db79439ff9089729ed
Author: Kévin Dietrich
Date:   Mon Dec 28 01:47:29 2015 +0100
Branches: openvdb
https://developer.blender.org/rB6a595bfa66fc5274263887db79439ff9089729ed

Merge branch 'master' into openvdb

Conflicts:
	intern/cycles/kernel/osl/osl_services.cpp

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



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

diff --cc intern/cycles/kernel/osl/osl_services.cpp
index 5dd999c,9ac8a3e..d9831d0
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@@ -42,13 -46,6 +42,14 @@@
  #include "kernel_montecarlo.h"
  #include "kernel_camera.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 "kernel_projection.h"