Merge branch 'master' into blender2.8

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__ ";

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;
 	}