diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:46 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:46 +0400 |
| commit | 24ad7e0bea77d942267344990d22e931610c3d07 (patch) | |
| tree | 5fe78f862e08bfb9e26e1d29cea2c2e403718df1 /intern/cycles/kernel/geom | |
| parent | 41d1675053b457370e70be137fd8105b9cd1890b (diff) | |
Cycles code refactor: add support for motion vertex attributes.
Diffstat (limited to 'intern/cycles/kernel/geom')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_curve.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/geom_triangle.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/geom/geom_curve.h b/intern/cycles/kernel/geom/geom_curve.h index 2daeb59c0ae..ec9081a6c75 100644 --- a/intern/cycles/kernel/geom/geom_curve.h +++ b/intern/cycles/kernel/geom/geom_curve.h @@ -28,7 +28,7 @@ ccl_device float curve_attribute_float(KernelGlobals *kg, const ShaderData *sd, return kernel_tex_fetch(__attributes_float, offset + sd->prim); } - else if(elem == ATTR_ELEMENT_CURVE_KEY) { + else if(elem == ATTR_ELEMENT_CURVE_KEY || elem == ATTR_ELEMENT_CURVE_KEY_MOTION) { float4 curvedata = kernel_tex_fetch(__curves, sd->prim); int k0 = __float_as_int(curvedata.x) + sd->segment; int k1 = k0 + 1; @@ -67,7 +67,7 @@ ccl_device float3 curve_attribute_float3(KernelGlobals *kg, const ShaderData *sd return float4_to_float3(kernel_tex_fetch(__attributes_float3, offset + sd->prim)); } - else if(elem == ATTR_ELEMENT_CURVE_KEY) { + else if(elem == ATTR_ELEMENT_CURVE_KEY || elem == ATTR_ELEMENT_CURVE_KEY_MOTION) { float4 curvedata = kernel_tex_fetch(__curves, sd->prim); int k0 = __float_as_int(curvedata.x) + sd->segment; int k1 = k0 + 1; diff --git a/intern/cycles/kernel/geom/geom_triangle.h b/intern/cycles/kernel/geom/geom_triangle.h index 6eaa077584b..1bdc76445f9 100644 --- a/intern/cycles/kernel/geom/geom_triangle.h +++ b/intern/cycles/kernel/geom/geom_triangle.h @@ -176,7 +176,7 @@ ccl_device float triangle_attribute_float(KernelGlobals *kg, const ShaderData *s return kernel_tex_fetch(__attributes_float, offset + sd->prim); } - else if(elem == ATTR_ELEMENT_VERTEX) { + else if(elem == ATTR_ELEMENT_VERTEX || elem == ATTR_ELEMENT_VERTEX_MOTION) { float3 tri_vindex = float4_to_float3(kernel_tex_fetch(__tri_vindex, sd->prim)); float f0 = kernel_tex_fetch(__attributes_float, offset + __float_as_int(tri_vindex.x)); @@ -219,7 +219,7 @@ ccl_device float3 triangle_attribute_float3(KernelGlobals *kg, const ShaderData return float4_to_float3(kernel_tex_fetch(__attributes_float3, offset + sd->prim)); } - else if(elem == ATTR_ELEMENT_VERTEX) { + else if(elem == ATTR_ELEMENT_VERTEX || elem == ATTR_ELEMENT_VERTEX_MOTION) { float3 tri_vindex = float4_to_float3(kernel_tex_fetch(__tri_vindex, sd->prim)); float3 f0 = float4_to_float3(kernel_tex_fetch(__attributes_float3, offset + __float_as_int(tri_vindex.x))); |