diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2012-08-30 10:31:02 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2012-08-30 10:31:02 +0400 |
| commit | ded5e9cd2324eaa28b85d17d0f8d394f72625c8a (patch) | |
| tree | eb3d9815e55a3ad8b66e5bf4a8c0b9cf26416c93 /intern/cycles/app | |
| parent | 3f83d273b344221de5ec30c39c305ad5fa486f42 (diff) | |
clamp for Mix node
the implementation was following my early commit for Math node
I haven't had a chance to run those through Brecht, but would like to do eventually. (they work fine though)
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 5ec5cb929d6..5569df927fb 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -484,6 +484,7 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug else if(string_iequals(node.name(), "mix")) { MixNode *mix = new MixNode(); xml_read_enum(&mix->type, MixNode::type_enum, node, "type"); + xml_read_bool(&mix->use_clamp, node, "use_clamp"); snode = mix; } else if(string_iequals(node.name(), "gamma")) { @@ -515,6 +516,7 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug else if(string_iequals(node.name(), "math")) { MathNode *math = new MathNode(); xml_read_enum(&math->type, MathNode::type_enum, node, "type"); + xml_read_bool(&math->use_clamp, node, "use_clamp"); snode = math; } else if(string_iequals(node.name(), "vector_math")) { |