diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-22 20:18:37 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-22 20:18:37 +0300 |
| commit | 9c5c91cc7cc8fc1cc3b2ce9e6973a46fb1ccb244 (patch) | |
| tree | 32aea98523a595bb2f775f1a8315c031b7cc39ff /intern | |
| parent | da5b6ed75bf08141dd19a0cc143d1a91b14a0f24 (diff) | |
| parent | 9e3e92a908dfaff6a3dbaba8ae31b1bef0d1d557 (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 d123c6dc7c8..e5f807833f3 100644 --- a/intern/cycles/kernel/bvh/bvh.h +++ b/intern/cycles/kernel/bvh/bvh.h @@ -253,6 +253,7 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg, PROFILING_INIT(kg, PROFILING_INTERSECT_LOCAL); if(!scene_intersect_valid(&ray)) { + local_isect->num_hits = 0; return false; } #ifdef __EMBREE__ |