From e3b1ae9a8166ebb2e5255b5c1f93c383b87a7024 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 12 Mar 2019 14:03:05 +0100 Subject: Fix T62481: Cycles crash rendering with UV pass after recent changes. --- intern/cycles/kernel/geom/geom_primitive.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'intern/cycles/kernel') 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 */ -- cgit v1.2.3