Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2011-12-02 01:46:10 +0400
committerDalai Felinto <dfelinto@gmail.com>2011-12-02 01:46:10 +0400
commit4db4a0933f8cef74a27561fa26e79ceab9021d67 (patch)
treedc641c5e8b4ab74fbdd51b13d6b115be2b7d5142 /intern/cycles/app
parentb7db2587fb839ff8586ca377c8cc93175e38f470 (diff)
SeparateRGB and CombineRGB nodes for Cycles materials
reviewed and approved by Brecht my first OpenCL code \o/
Diffstat (limited to 'intern/cycles/app')
-rw-r--r--intern/cycles/app/cycles_xml.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 5f9e1d7a5ff..d89c30619b6 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -471,6 +471,12 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
xml_read_enum(&mix->type, MixNode::type_enum, node, "type");
snode = mix;
}
+ else if(string_iequals(node.name(), "combine_rgb")) {
+ snode = new CombineRGBNode();
+ }
+ else if(string_iequals(node.name(), "separate_rgb")) {
+ snode = new SeparateRGBNode();
+ }
else if(string_iequals(node.name(), "attribute")) {
AttributeNode *attr = new AttributeNode();
xml_read_ustring(&attr->attribute, node, "attribute");