diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-12-23 12:49:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-23 14:14:17 +0300 |
| commit | b9311b5e5a51fec85e3bb3c1d3eaa8a2dcc839e3 (patch) | |
| tree | 585552fa1062a539bef4e66850ad265946030c13 /intern/cycles/kernel/bvh | |
| parent | 2ae39ff6b192b259e6a2c593d72a9c9008a029c4 (diff) | |
Cycles: Make object flag names more obvious that hey are object and not shader
Diffstat (limited to 'intern/cycles/kernel/bvh')
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh_subsurface.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/bvh/qbvh_subsurface.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/bvh/bvh_subsurface.h b/intern/cycles/kernel/bvh/bvh_subsurface.h index d9623c94b2e..889bbca21e2 100644 --- a/intern/cycles/kernel/bvh/bvh_subsurface.h +++ b/intern/cycles/kernel/bvh/bvh_subsurface.h @@ -72,7 +72,7 @@ void BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg, ss_isect->num_hits = 0; const int object_flag = kernel_tex_fetch(__object_flag, subsurface_object); - if(!(object_flag & SD_TRANSFORM_APPLIED)) { + if(!(object_flag & SD_OBJECT_TRANSFORM_APPLIED)) { #if BVH_FEATURE(BVH_MOTION) Transform ob_itfm; bvh_instance_motion_push(kg, diff --git a/intern/cycles/kernel/bvh/qbvh_subsurface.h b/intern/cycles/kernel/bvh/qbvh_subsurface.h index ccd36df034a..84dc4003133 100644 --- a/intern/cycles/kernel/bvh/qbvh_subsurface.h +++ b/intern/cycles/kernel/bvh/qbvh_subsurface.h @@ -61,7 +61,7 @@ ccl_device void BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg, ss_isect->num_hits = 0; const int object_flag = kernel_tex_fetch(__object_flag, subsurface_object); - if(!(object_flag & SD_TRANSFORM_APPLIED)) { + if(!(object_flag & SD_OBJECT_TRANSFORM_APPLIED)) { #if BVH_FEATURE(BVH_MOTION) Transform ob_itfm; bvh_instance_motion_push(kg, |