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/geom | |
| parent | 2ae39ff6b192b259e6a2c593d72a9c9008a029c4 (diff) | |
Cycles: Make object flag names more obvious that hey are object and not shader
Diffstat (limited to 'intern/cycles/kernel/geom')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_motion_triangle_shader.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/geom_primitive.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/geom_triangle.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/geom/geom_motion_triangle_shader.h b/intern/cycles/kernel/geom/geom_motion_triangle_shader.h index c5dbc6a2f52..5b1e014f850 100644 --- a/intern/cycles/kernel/geom/geom_motion_triangle_shader.h +++ b/intern/cycles/kernel/geom/geom_motion_triangle_shader.h @@ -81,7 +81,7 @@ ccl_device_noinline void motion_triangle_shader_setup(KernelGlobals *kg, } /* Compute face normal. */ float3 Ng; - if(ccl_fetch(sd, flag) & SD_NEGATIVE_SCALE_APPLIED) { + if(ccl_fetch(sd, flag) & SD_OBJECT_NEGATIVE_SCALE_APPLIED) { Ng = normalize(cross(verts[2] - verts[0], verts[1] - verts[0])); } else { diff --git a/intern/cycles/kernel/geom/geom_primitive.h b/intern/cycles/kernel/geom/geom_primitive.h index 4384c2093e9..dba82588dbc 100644 --- a/intern/cycles/kernel/geom/geom_primitive.h +++ b/intern/cycles/kernel/geom/geom_primitive.h @@ -157,7 +157,7 @@ ccl_device_inline float4 primitive_motion_vector(KernelGlobals *kg, ShaderData * if(is_curve_primitive) { center = curve_motion_center_location(kg, sd); - if(!(ccl_fetch(sd, flag) & SD_TRANSFORM_APPLIED)) + if(!(ccl_fetch(sd, flag) & SD_OBJECT_TRANSFORM_APPLIED)) object_position_transform(kg, sd, ¢er); } else diff --git a/intern/cycles/kernel/geom/geom_triangle.h b/intern/cycles/kernel/geom/geom_triangle.h index 17538872ead..9ed619f0bbf 100644 --- a/intern/cycles/kernel/geom/geom_triangle.h +++ b/intern/cycles/kernel/geom/geom_triangle.h @@ -32,7 +32,7 @@ ccl_device_inline float3 triangle_normal(KernelGlobals *kg, ShaderData *sd) const float3 v2 = float4_to_float3(kernel_tex_fetch(__prim_tri_verts, tri_vindex.w+2)); /* return normal */ - if(ccl_fetch(sd, flag) & SD_NEGATIVE_SCALE_APPLIED) + if(ccl_fetch(sd, flag) & SD_OBJECT_NEGATIVE_SCALE_APPLIED) return normalize(cross(v2 - v0, v1 - v0)); else return normalize(cross(v1 - v0, v2 - v0)); @@ -55,7 +55,7 @@ ccl_device_inline void triangle_point_normal(KernelGlobals *kg, int object, int int object_flag = kernel_tex_fetch(__object_flag, object); /* compute normal */ - if(object_flag & SD_NEGATIVE_SCALE_APPLIED) + if(object_flag & SD_OBJECT_NEGATIVE_SCALE_APPLIED) *Ng = normalize(cross(v2 - v0, v1 - v0)); else *Ng = normalize(cross(v1 - v0, v2 - v0)); |