diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2016-08-17 17:33:28 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2016-08-17 17:43:13 +0300 |
| commit | 8cac980a289676b34613fe77c9fb1f2fd57212d8 (patch) | |
| tree | 71e49e878070ef099668c5bb2fa675d8a74e35fa /intern/cycles/kernel/geom | |
| parent | ab775b6ae9930e1fc6b8536f5ca150557286a119 (diff) | |
Cycles: Fix regression where smoke wouldn't show in renders
Diffstat (limited to 'intern/cycles/kernel/geom')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_attribute.h | 6 |
1 files changed, 5 insertions, 1 deletions
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(); } |