diff options
Diffstat (limited to 'intern/cycles/kernel/svm/svm_closure.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_closure.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h index 3cf33f4d431..a7e87715ed4 100644 --- a/intern/cycles/kernel/svm/svm_closure.h +++ b/intern/cycles/kernel/svm/svm_closure.h @@ -744,7 +744,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float * const AttributeDescriptor attr_descr_random = find_attribute(kg, sd, data_node4.y); float random = 0.0f; if(attr_descr_random.offset != ATTR_STD_NOT_FOUND) { - random = primitive_attribute_float(kg, sd, attr_descr_random, NULL, NULL); + random = primitive_surface_attribute_float(kg, sd, attr_descr_random, NULL, NULL); } else { random = stack_load_float_default(stack, random_ofs, data_node3.y); @@ -974,7 +974,7 @@ ccl_device void svm_node_principled_volume(KernelGlobals *kg, ShaderData *sd, fl /* Density and color attribute lookup if available. */ const AttributeDescriptor attr_density = find_attribute(kg, sd, attr_node.x); if(attr_density.offset != ATTR_STD_NOT_FOUND) { - primitive_density = primitive_attribute_float(kg, sd, attr_density, NULL, NULL); + primitive_density = primitive_volume_attribute_float(kg, sd, attr_density); density = fmaxf(density * primitive_density, 0.0f); } } @@ -985,7 +985,7 @@ ccl_device void svm_node_principled_volume(KernelGlobals *kg, ShaderData *sd, fl const AttributeDescriptor attr_color = find_attribute(kg, sd, attr_node.y); if(attr_color.offset != ATTR_STD_NOT_FOUND) { - color *= primitive_attribute_float3(kg, sd, attr_color, NULL, NULL); + color *= primitive_volume_attribute_float3(kg, sd, attr_color); } /* Add closure for volume scattering. */ @@ -1026,7 +1026,7 @@ ccl_device void svm_node_principled_volume(KernelGlobals *kg, ShaderData *sd, fl /* Add flame temperature from attribute if available. */ const AttributeDescriptor attr_temperature = find_attribute(kg, sd, attr_node.z); if(attr_temperature.offset != ATTR_STD_NOT_FOUND) { - float temperature = primitive_attribute_float(kg, sd, attr_temperature, NULL, NULL); + float temperature = primitive_volume_attribute_float(kg, sd, attr_temperature); T *= fmaxf(temperature, 0.0f); } |