diff options
| author | jon denning <gfxcoder@gmail.com> | 2022-07-29 20:51:49 +0300 |
|---|---|---|
| committer | jon denning <gfxcoder@gmail.com> | 2022-07-29 20:51:49 +0300 |
| commit | 6485941d7a8158381288ce044b657e2c147ff73a (patch) | |
| tree | 8fc98916154dfc7d7f57a95732fddb620272d9ac /intern/cycles/kernel/bvh/traversal.h | |
| parent | eee25a175ad3c0736878918bacd4995e67195ec0 (diff) | |
| parent | 9b9417b66150fd070619006dbd233369709edf1b (diff) | |
Merge branch 'master' into retopo_transformretopo_transform
Diffstat (limited to 'intern/cycles/kernel/bvh/traversal.h')
| -rw-r--r-- | intern/cycles/kernel/bvh/traversal.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/intern/cycles/kernel/bvh/traversal.h b/intern/cycles/kernel/bvh/traversal.h index 9069d16912b..f3744aca5c0 100644 --- a/intern/cycles/kernel/bvh/traversal.h +++ b/intern/cycles/kernel/bvh/traversal.h @@ -237,11 +237,7 @@ ccl_device_noinline bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals kg, kernel_assert(object != OBJECT_NONE); /* instance pop */ -#if BVH_FEATURE(BVH_MOTION) - bvh_instance_motion_pop(kg, object, ray, &P, &dir, &idir); -#else - bvh_instance_pop(kg, object, ray, &P, &dir, &idir); -#endif + bvh_instance_pop(ray, &P, &dir, &idir); object = OBJECT_NONE; node_addr = traversal_stack[stack_ptr]; |