archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Browse Source 
Merging the node changes required a lot of conflict resolution, fixed the
issues I could find but if you want stability you might want to wait a bit
before updating.
This commit is contained in:
Brecht Van Lommel
2011-09-17 13:28:40 +00:00
parent 66b1dfae89 d87fcb0760
commit f4a9215d7c
661 changed files with 43775 additions and 22579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,14 +97,14 @@ static BL::NodeSocket get_node_output(BL::Node b_node, const string& name)
static float3 get_node_output_rgba(BL::Node b_node, const string& name)
{
BL::RGBANodeSocket sock(get_node_output(b_node, name));
BL::NodeSocketRGBA sock(get_node_output(b_node, name));
return get_float3(sock.default_value());
}
static float get_node_output_value(BL::Node b_node, const string& name)
{
BL::ValueNodeSocket sock(get_node_output(b_node, name));
return sock.default_value()[0];
BL::NodeSocketFloatNone sock(get_node_output(b_node, name));
return sock.default_value();
}
static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::Node *b_group_node, BL::ShaderNode b_node)
@@ -400,7 +400,7 @@ static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::Node *
}
}
if(node != graph->output())
if(node && node != graph->output())
graph->add(node);
return node;
@@ -453,19 +453,19 @@ static void add_nodes(BL::BlendData b_data, ShaderGraph *graph, BL::ShaderNodeTr
/* copy values for non linked inputs */
switch(input->type) {
case SHADER_SOCKET_FLOAT: {
BL::ValueNodeSocket value_sock(sock);
input->set(value_sock.default_value()[0]);
BL::NodeSocketFloatNone value_sock(sock);
input->set(value_sock.default_value());
break;
}
case SHADER_SOCKET_COLOR: {
BL::RGBANodeSocket rgba_sock(sock);
BL::NodeSocketRGBA rgba_sock(sock);
input->set(get_float3(rgba_sock.default_value()));
break;
}
case SHADER_SOCKET_NORMAL:
case SHADER_SOCKET_POINT:
case SHADER_SOCKET_VECTOR: {
BL::VectorNodeSocket vec_sock(sock);
BL::NodeSocketVectorNone vec_sock(sock);
input->set(get_float3(vec_sock.default_value()));
break;
}