diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-07 13:01:09 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-07 13:01:09 +0300 |
| commit | 366ac88d685d569e5eaa19ce3fc43764683b60fd (patch) | |
| tree | 105fe398a57a1a1f642b0642df87fcf5eb70d4ca /intern/cycles | |
| parent | a54235e0c6345faed6b7f709039ff6efa64d2549 (diff) | |
| parent | 16017178b24c9c84df5c1114fae8dce4796c6c26 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh.h | 25 | ||||
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh_local.h | 26 |
2 files changed, 24 insertions, 27 deletions
diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h index c0a5bb434ea..d3e0b25a200 100644 --- a/intern/cycles/kernel/bvh/bvh.h +++ b/intern/cycles/kernel/bvh/bvh.h @@ -212,21 +212,20 @@ ccl_device_intersect void scene_intersect_local(KernelGlobals *kg, { #ifdef __OBJECT_MOTION__ if(kernel_data.bvh.have_motion) { - bvh_intersect_local_motion(kg, - &ray, - local_isect, - local_object, - lcg_state, - max_hits); - return; + return bvh_intersect_local_motion(kg, + &ray, + local_isect, + local_object, + lcg_state, + max_hits); } #endif /* __OBJECT_MOTION__ */ - bvh_intersect_local(kg, - &ray, - local_isect, - local_object, - lcg_state, - max_hits); + return bvh_intersect_local(kg, + &ray, + local_isect, + local_object, + lcg_state, + max_hits); } #endif diff --git a/intern/cycles/kernel/bvh/bvh_local.h b/intern/cycles/kernel/bvh/bvh_local.h index 605d4166819..9292cc76a5c 100644 --- a/intern/cycles/kernel/bvh/bvh_local.h +++ b/intern/cycles/kernel/bvh/bvh_local.h @@ -246,22 +246,20 @@ ccl_device_inline void BVH_FUNCTION_NAME(KernelGlobals *kg, switch(kernel_data.bvh.bvh_layout) { #ifdef __QBVH__ case BVH_LAYOUT_BVH4: - BVH_FUNCTION_FULL_NAME(QBVH)(kg, - ray, - local_isect, - local_object, - lcg_state, - max_hits); - break; + return BVH_FUNCTION_FULL_NAME(QBVH)(kg, + ray, + local_isect, + local_object, + lcg_state, + max_hits); #endif case BVH_LAYOUT_BVH2: - BVH_FUNCTION_FULL_NAME(BVH)(kg, - ray, - local_isect, - local_object, - lcg_state, - max_hits); - break; + return BVH_FUNCTION_FULL_NAME(BVH)(kg, + ray, + local_isect, + local_object, + lcg_state, + max_hits); } kernel_assert(!"Should not happen"); } |