diff options
author | Thomas Dinges <blender@dingto.org> | 2014-05-29 14:38:03 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-05-29 14:38:03 +0400 |
commit | 4f83d3ec76dfd8b8a025effc1b9615caa310ebfd (patch) | |
tree | 4e8cd29ba778d0e252d2832ff2a438aaef3503d6 /intern | |
parent | 3e0d5898e548cdeea3488c9795898b5e42c3463a (diff) |
Fix OpenCL compilation error in Cycles, when building without hair support.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/geom/geom_primitive.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/geom/geom_primitive.h b/intern/cycles/kernel/geom/geom_primitive.h index 533973621d7..5df6c75df86 100644 --- a/intern/cycles/kernel/geom/geom_primitive.h +++ b/intern/cycles/kernel/geom/geom_primitive.h @@ -143,6 +143,7 @@ ccl_device float4 primitive_motion_vector(KernelGlobals *kg, ShaderData *sd) /* center position */ float3 center; +#ifdef __HAIR__ if(sd->type & PRIMITIVE_ALL_CURVE) { center = curve_motion_center_location(kg, sd); @@ -150,6 +151,7 @@ ccl_device float4 primitive_motion_vector(KernelGlobals *kg, ShaderData *sd) object_position_transform(kg, sd, ¢er); } else +#endif center = sd->P; float3 motion_pre = center, motion_post = center; |