[Bf-blender-cvs] [8cac980] master: Cycles: Fix regression where smoke wouldn't show in renders

[Mai Lavelle]

Commit: 8cac980a289676b34613fe77c9fb1f2fd57212d8
Author: Mai Lavelle
Date:   Wed Aug 17 10:33:28 2016 -0400
Branches: master
https://developer.blender.org/rB8cac980a289676b34613fe77c9fb1f2fd57212d8

Cycles: Fix regression where smoke wouldn't show in renders

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

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

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

diff --git a/intern/cycles/kernel/geom/geom_attribute.h b/intern/cycles/kernel/geom/geom_attribute.h
index 8604d30..08ccee5 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();
 	}