diff options
| author | Martijn Berger <mberger@denc.com> | 2014-09-24 15:34:28 +0400 |
|---|---|---|
| committer | Martijn Berger <mberger@denc.com> | 2014-09-24 15:34:28 +0400 |
| commit | 25ec0d97f988154583295335c22a9ccd7894fe65 (patch) | |
| tree | cab4dd66d4467e46a753d5d179c4a5990e0b96ca /intern/cycles/kernel/geom/geom_motion_triangle.h | |
| parent | cbffc7499ef89cac19c07ee2116b8e1e5d38afe5 (diff) | |
make "tri_shader" an int instead of a float
tri_shader does no longer need to a float.
Reviewers: dingto, sergey
Reviewed By: dingto, sergey
Subscribers: dingto
Projects: #cycles
Differential Revision: https://developer.blender.org/D789
Diffstat (limited to 'intern/cycles/kernel/geom/geom_motion_triangle.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_motion_triangle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/geom/geom_motion_triangle.h b/intern/cycles/kernel/geom/geom_motion_triangle.h index 7409aa0d014..b275b89a8a4 100644 --- a/intern/cycles/kernel/geom/geom_motion_triangle.h +++ b/intern/cycles/kernel/geom/geom_motion_triangle.h @@ -233,7 +233,7 @@ ccl_device_inline float3 motion_triangle_refine_subsurface(KernelGlobals *kg, Sh ccl_device_noinline void motion_triangle_shader_setup(KernelGlobals *kg, ShaderData *sd, const Intersection *isect, const Ray *ray, bool subsurface) { /* get shader */ - sd->shader = __float_as_int(kernel_tex_fetch(__tri_shader, sd->prim)); + sd->shader = kernel_tex_fetch(__tri_shader, sd->prim); /* get motion info */ int numsteps, numverts; |