diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2016-08-23 20:57:45 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2016-08-24 17:39:00 +0300 |
| commit | 74bd80996287b3d7bb99fa9e980bb545f59155f7 (patch) | |
| tree | c2a33252d26dca3c93d75bc3d14c380b106649d4 /intern/cycles/kernel/svm/svm_attribute.h | |
| parent | 0ca4e3942427ad294428ba1b8db2cafe3bbdf5d6 (diff) | |
Cycles Standalone: Fix support for subdivision meshes
Changes from microdisplacement work broke previous support for subdivision
meshes, sometimes leading to crashes; this makes things work again. Files
that contain "patch" nodes will need to be updated to use meshes instead, as
specifying patches was both inefficient and completely unsupported by the new
subdivision code.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_attribute.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_attribute.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm_attribute.h b/intern/cycles/kernel/svm/svm_attribute.h index de978a423b4..0e55c99ae97 100644 --- a/intern/cycles/kernel/svm/svm_attribute.h +++ b/intern/cycles/kernel/svm/svm_attribute.h @@ -30,14 +30,14 @@ ccl_device AttributeDescriptor svm_node_attr_init(KernelGlobals *kg, ShaderData if(ccl_fetch(sd, object) != OBJECT_NONE) { desc = find_attribute(kg, sd, node.y); if(desc.offset == ATTR_STD_NOT_FOUND) { - desc.element = ATTR_ELEMENT_NONE; + desc = attribute_not_found(); desc.offset = 0; desc.type = (NodeAttributeType)node.w; } } else { /* background */ - desc.element = ATTR_ELEMENT_NONE; + desc = attribute_not_found(); desc.offset = 0; desc.type = (NodeAttributeType)node.w; } |