Merge branch 'blender2.7'

2019-02-20 23:20:43 +01:00 · 2019-02-20 23:20:43 +01:00 · 9e4d561a8b
parent 1303bd57f5 ccd291aafb
commit 9e4d561a8b
1 changed files with 1 additions and 0 deletions
--- a/intern/cycles/kernel/bvh/bvh.h
+++ b/intern/cycles/kernel/bvh/bvh.h
@ -334,6 +334,7 @@ ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals *kg,
 	PROFILING_INIT(kg, PROFILING_INTERSECT_SHADOW_ALL);

 	if(!scene_intersect_valid(ray)) {
+		*num_hits = 0;
 		return false;
 	}
 #  ifdef __EMBREE__