Code refactor: improve attribute handling for optional volume attributes.

A volume shader should be able to request attributes, and still be rendered
as homogeneous if no volume attributes are available for the object.

1 files changed, 13 insertions, 0 deletions

diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 4d066c89b76..9e931280691 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -744,6 +744,10 @@ void OSLCompiler::add(ShaderNode *node, const char *name, bool isfilepath)
 		current_shader->has_object_dependency = true;
 	}
 
+	if(node->has_attribute_dependency()) {
+		current_shader->has_attribute_dependency = true;
+	}
+
 	if(node->has_integrator_dependency()) {
 		current_shader->has_integrator_dependency = true;
 	}
@@ -991,6 +995,14 @@ void OSLCompiler::parameter_color_array(const char *name, const array<float3>& f
 	ss->Parameter(name, type, table.data());
 }
 
+void OSLCompiler::parameter_attribute(const char *name, ustring s)
+{
+	if(Attribute::name_standard(s.c_str()))
+		parameter(name, (string("geom:") + s.c_str()).c_str());
+	else
+		parameter(name, s.c_str());
+}
+
 void OSLCompiler::find_dependencies(ShaderNodeSet& dependencies, ShaderInput *input)
 {
 	ShaderNode *node = (input->link)? input->link->parent: NULL;
@@ -1124,6 +1136,7 @@ void OSLCompiler::compile(Scene *scene, OSLGlobals *og, Shader *shader)
 		shader->has_surface_spatial_varying = false;
 		shader->has_volume_spatial_varying = false;
 		shader->has_object_dependency = false;
+		shader->has_attribute_dependency = false;
 		shader->has_integrator_dependency = false;
 
 		/* generate surface shader */