diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 16:33:07 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 16:33:07 +0300 |
| commit | 30a2ad8efedb8513098682a860ebb8b1a54a1eca (patch) | |
| tree | c711dc58d6f0e9ccee375053acdf5abc85fd1e9a | |
| parent | 3dee8b4a12f068f3837946a0c2222459385305d3 (diff) | |
| parent | c6bbe6c5aac29a4d36eb3aedd488ca4deac68fb7 (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | intern/cycles/device/opencl/opencl_base.cpp | 7 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/intern/cycles/device/opencl/opencl_base.cpp b/intern/cycles/device/opencl/opencl_base.cpp index 69a2bd7adcb..cc887134bb0 100644 --- a/intern/cycles/device/opencl/opencl_base.cpp +++ b/intern/cycles/device/opencl/opencl_base.cpp @@ -1179,8 +1179,13 @@ string OpenCLDeviceBase::kernel_build_options(const string *debug_src) build_options += "-g -s \"" + *debug_src + "\" "; } - if(OpenCLInfo::use_debug()) + if(info.has_half_images) { + build_options += "-D__KERNEL_CL_KHR_FP16__ "; + } + + if(OpenCLInfo::use_debug()) { build_options += "-D__KERNEL_OPENCL_DEBUG__ "; + } #ifdef WITH_CYCLES_DEBUG build_options += "-D__KERNEL_DEBUG__ "; diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 0ba30fedc32..d3aa5250955 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -1365,6 +1365,7 @@ void cloth_find_point_contacts(Depsgraph *depsgraph, Object *ob, ClothModifierDa if (!collobjs) { *r_collider_contacts = NULL; *r_totcolliders = 0; + BLI_bvhtree_free(cloth_bvh); return; } |