[Bf-blender-cvs] [4f83d3e] master: Fix OpenCL compilation error in Cycles, when building without hair support.

[Thomas Dinges]

Commit: 4f83d3ec76dfd8b8a025effc1b9615caa310ebfd
Author: Thomas Dinges
Date:   Thu May 29 12:38:03 2014 +0200
https://developer.blender.org/rB4f83d3ec76dfd8b8a025effc1b9615caa310ebfd

Fix OpenCL compilation error in Cycles, when building without hair support.

===================================================================

M       intern/cycles/kernel/geom/geom_primitive.h

===================================================================

diff --git a/intern/cycles/kernel/geom/geom_primitive.h 
b/intern/cycles/kernel/geom/geom_primitive.h
index 5339736..5df6c75 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, &center);
        }
        else
+#endif
                center = sd->P;
 
        float3 motion_pre = center, motion_post = center;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs