diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-12 16:22:53 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-12 16:22:53 +0300 |
| commit | 645cc3e8710b043e214931ae4110c2d86034b946 (patch) | |
| tree | 366cb98a8dd9b6562ab9ff876f507008a0cacb20 /intern/cycles/kernel | |
| parent | 8ba1c3072ca9fd3b2ab3be3bffa617c2a5cf0b7b (diff) | |
| parent | e3b1ae9a8166ebb2e5255b5c1f93c383b87a7024 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_primitive.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/intern/cycles/kernel/geom/geom_primitive.h b/intern/cycles/kernel/geom/geom_primitive.h index c9b1995ee05..95d9d1050fb 100644 --- a/intern/cycles/kernel/geom/geom_primitive.h +++ b/intern/cycles/kernel/geom/geom_primitive.h @@ -219,9 +219,8 @@ ccl_device_inline float3 primitive_uv(KernelGlobals *kg, ShaderData *sd) if(desc.offset == ATTR_STD_NOT_FOUND) return make_float3(0.0f, 0.0f, 0.0f); - float3 uv = primitive_surface_attribute_float3(kg, sd, desc, NULL, NULL); - uv.z = 1.0f; - return uv; + float2 uv = primitive_surface_attribute_float2(kg, sd, desc, NULL, NULL); + return make_float3(uv.x, uv.y, 1.0f); } /* Ptex coordinates */ |