From 8cac980a289676b34613fe77c9fb1f2fd57212d8 Mon Sep 17 00:00:00 2001 From: Mai Lavelle Date: Wed, 17 Aug 2016 10:33:28 -0400 Subject: Cycles: Fix regression where smoke wouldn't show in renders --- intern/cycles/kernel/geom/geom_attribute.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'intern/cycles/kernel/geom') diff --git a/intern/cycles/kernel/geom/geom_attribute.h b/intern/cycles/kernel/geom/geom_attribute.h index 8604d30ad34..08ccee56335 100644 --- a/intern/cycles/kernel/geom/geom_attribute.h +++ b/intern/cycles/kernel/geom/geom_attribute.h @@ -73,7 +73,11 @@ ccl_device_inline AttributeDescriptor find_attribute(KernelGlobals *kg, const Sh AttributeDescriptor desc; desc.element = (AttributeElement)attr_map.y; - if(ccl_fetch(sd, prim) == PRIM_NONE && desc.element != ATTR_ELEMENT_MESH) { + if(ccl_fetch(sd, prim) == PRIM_NONE && + desc.element != ATTR_ELEMENT_MESH && + desc.element != ATTR_ELEMENT_VOXEL && + desc.element != ATTR_ELEMENT_OBJECT) + { return attribute_not_found(); } -- cgit v1.2.3