diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-25 15:19:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-25 15:19:38 +0400 |
| commit | 158a70c8a387c1e3fa414ecfbb063091421992d8 (patch) | |
| tree | 07212c8732c5987dc838266714d2038296b9a6c4 /intern/cycles | |
| parent | 23f632a49c2b00aece9286c125b98fdc10e93532 (diff) | |
the mutex struct seems to be different across systems, use memset rather then an initializer value.
also quiet warning in cycles.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/kernel_triangle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_triangle.h b/intern/cycles/kernel/kernel_triangle.h index 384c3a8a506..6c1ea465515 100644 --- a/intern/cycles/kernel/kernel_triangle.h +++ b/intern/cycles/kernel/kernel_triangle.h @@ -191,7 +191,7 @@ __device int triangle_find_attribute(KernelGlobals *kg, ShaderData *sd, uint id) attr_map = kernel_tex_fetch(__attributes_map, ++attr_offset); /* return result */ - return (attr_map.y == ATTR_ELEMENT_NONE)? ATTR_STD_NOT_FOUND: attr_map.z; + return (attr_map.y == ATTR_ELEMENT_NONE) ? (int)ATTR_STD_NOT_FOUND : attr_map.z; } __device float4 triangle_motion_vector(KernelGlobals *kg, ShaderData *sd) |