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
path: root/intern
diff options
context:
space:
mode:
authorLukas Toenne <lukas.toenne@googlemail.com>2013-03-23 20:45:38 +0400
committerLukas Toenne <lukas.toenne@googlemail.com>2013-03-23 20:45:38 +0400
commite2baf49d794d3bfe802238a5ba36380fc762b876 (patch)
treeeef0d14aaae8fe9d1b20a1b8e8d35b0a5b414031 /intern
parentc79b923c1d3b4b61bb133a525333ade8f2e7dc08 (diff)
Fix for cycles group node bug, reported on IRC: Group nodes input proxies did not get their correct default value set. Forgot to add this during r55440 ...
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_shader.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index bf934147527..b451764c347 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -697,6 +697,8 @@ static void add_nodes(Scene *scene, BL::BlendData b_data, BL::Scene b_scene, Sha
group_proxy_map[b_input->identifier()] = proxy;
input_map[b_input->ptr.data] = proxy->inputs[0];
+
+ set_default_value(proxy->inputs[0], *b_node, *b_input, b_data, b_ntree);
}
for(b_node->outputs.begin(b_output); b_output != b_node->outputs.end(); ++b_output) {
ProxyNode *proxy = new ProxyNode(convert_socket_type(*b_output));