diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:06:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:06:14 +0300 |
| commit | 5b643018348280ee601a20fb9329d5a313c23446 (patch) | |
| tree | b2bb37028ac88a655aea37bb7a8b850b84885cea /intern | |
| parent | f6743fcaa4fbccd4bd8a92c44a3cd4bd2d153fd1 (diff) | |
| parent | 2d3d76693a84224b86eac50729fb5a321753b7e3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh.h | 25 | ||||
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh_local.h | 26 |
2 files changed, 27 insertions, 24 deletions
diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h index d3e0b25a200..c0a5bb434ea 100644 --- a/intern/cycles/kernel/bvh/bvh.h +++ b/intern/cycles/kernel/bvh/bvh.h @@ -212,20 +212,21 @@ ccl_device_intersect void scene_intersect_local(KernelGlobals *kg, { #ifdef __OBJECT_MOTION__ if(kernel_data.bvh.have_motion) { - return bvh_intersect_local_motion(kg, - &ray, - local_isect, - local_object, - lcg_state, - max_hits); + bvh_intersect_local_motion(kg, + &ray, + local_isect, + local_object, + lcg_state, + max_hits); + return; } #endif /* __OBJECT_MOTION__ */ - return bvh_intersect_local(kg, - &ray, - local_isect, - local_object, - lcg_state, - max_hits); + 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 9292cc76a5c..605d4166819 100644 --- a/intern/cycles/kernel/bvh/bvh_local.h +++ b/intern/cycles/kernel/bvh/bvh_local.h @@ -246,20 +246,22 @@ ccl_device_inline void BVH_FUNCTION_NAME(KernelGlobals *kg, switch(kernel_data.bvh.bvh_layout) { #ifdef __QBVH__ case BVH_LAYOUT_BVH4: - return BVH_FUNCTION_FULL_NAME(QBVH)(kg, - ray, - local_isect, - local_object, - lcg_state, - max_hits); + BVH_FUNCTION_FULL_NAME(QBVH)(kg, + ray, + local_isect, + local_object, + lcg_state, + max_hits); + break; #endif case BVH_LAYOUT_BVH2: - return BVH_FUNCTION_FULL_NAME(BVH)(kg, - ray, - local_isect, - local_object, - lcg_state, - max_hits); + BVH_FUNCTION_FULL_NAME(BVH)(kg, + ray, + local_isect, + local_object, + lcg_state, + max_hits); + break; } kernel_assert(!"Should not happen"); } |