Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T46406: Cycles ignores default socket value associated with group socket

Browse Source
This commit is contained in:
Sergey Sharybin
2015-10-08 16:03:13 +05:00
parent fca1d14214
commit 1730c3666f
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
intern/cycles/blender/blender_shader.cpp
View File

@@ -107,8 +107,15 @@ static ShaderSocketType convert_socket_type(BL::NodeSocket b_socket)
} }
} }
static void set_default_value(ShaderInput *input, BL::NodeSocket b_sock, BL::BlendData b_data, BL::ID b_id) template <class SocketType>
static void set_default_value(ShaderInput *input,
SocketType b_sock,
BL::BlendData b_data,
BL::ID b_id)
{ {
/* TODO(sergey): Use static assert to check SocketType is either BL::NodeSocket
* or BL::NodeSocketInterface.
*/
/* copy values for non linked inputs */ /* copy values for non linked inputs */
switch(input->type) { switch(input->type) {
case SHADER_SOCKET_FLOAT: { case SHADER_SOCKET_FLOAT: {
@@ -911,7 +918,8 @@ static void add_nodes(Scene *scene,
* Do this even if the node group has no internal tree, * Do this even if the node group has no internal tree,
* so that links have something to connect to and assert won't fail. * so that links have something to connect to and assert won't fail.
*/ */
for(b_node->inputs.begin(b_input); b_input != b_node->inputs.end(); ++b_input) { int input_index = 0;
for(b_node->inputs.begin(b_input); b_input != b_node->inputs.end(); ++b_input, ++input_index) {
ProxyNode *proxy = new ProxyNode(convert_socket_type(*b_input)); ProxyNode *proxy = new ProxyNode(convert_socket_type(*b_input));
graph->add(proxy); graph->add(proxy);
@@ -920,7 +928,11 @@ static void add_nodes(Scene *scene,
input_map[b_input->ptr.data] = proxy->inputs[0]; input_map[b_input->ptr.data] = proxy->inputs[0];
set_default_value(proxy->inputs[0], *b_input, b_data, b_ntree); /* Use default value from corresponding socket interface since it's
* not copied from group to actual group node.
*/
BL::NodeSocketInterface socket_interface = b_group_ntree.inputs[input_index];
set_default_value(proxy->inputs[0], socket_interface, b_data, b_ntree);
} }
for(b_node->outputs.begin(b_output); b_output != b_node->outputs.end(); ++b_output) { for(b_node->outputs.begin(b_output); b_output != b_node->outputs.end(); ++b_output) {
ProxyNode *proxy = new ProxyNode(convert_socket_type(*b_output)); ProxyNode *proxy = new ProxyNode(convert_socket_type(*b_output));