diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-21 01:20:43 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-21 01:20:43 +0300 |
| commit | 9e4d561a8b7db26bf8ba70e0198c3a465609c96d (patch) | |
| tree | ca93ed5e14992becf0b232c3b7030a9d32a90a19 /intern | |
| parent | 1303bd57f57b8d6c373d5320ad9ca4857d5b310b (diff) | |
| parent | ccd291aafbe5f0478963dc6e7f6b957a08eea511 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h index 284b1e9208c..d123c6dc7c8 100644 --- 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__ |