diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-11-12 17:26:24 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-11-12 19:33:07 +0300 |
| commit | 188ecee6424f0eae1cf94ca9256795d068aa4200 (patch) | |
| tree | 6668db0a17fdd3945ced552b2cf5c9d8d7ab3f7d /intern/cycles/app | |
| parent | 627141082b12f266adb43478402edd1900240765 (diff) | |
Fix T49985: cycles standalone using wrong socket names for XML reading.
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 8a3eb98a5a0..b3be07fce48 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -210,17 +210,6 @@ static void xml_read_camera(XMLReadState& state, pugi::xml_node node) /* Shader */ -static string xml_socket_name(const char *name) -{ - string sname = name; - size_t i; - - while((i = sname.find(" ")) != string::npos) - sname.replace(i, 1, ""); - - return sname; -} - static void xml_read_shader_graph(XMLReadState& state, Shader *shader, pugi::xml_node graph_node) { xml_read_node(state, shader, graph_node); @@ -255,7 +244,7 @@ static void xml_read_shader_graph(XMLReadState& state, Shader *shader, pugi::xml ShaderNode *fromnode = (ShaderNode*)graph_reader.node_map[from_node_name]; foreach(ShaderOutput *out, fromnode->outputs) - if(string_iequals(xml_socket_name(out->name().c_str()), from_socket_name.c_str())) + if(string_iequals(out->socket_type.name.string(), from_socket_name.string())) output = out; if(!output) @@ -268,7 +257,7 @@ static void xml_read_shader_graph(XMLReadState& state, Shader *shader, pugi::xml ShaderNode *tonode = (ShaderNode*)graph_reader.node_map[to_node_name]; foreach(ShaderInput *in, tonode->inputs) - if(string_iequals(xml_socket_name(in->name().c_str()), to_socket_name.c_str())) + if(string_iequals(in->socket_type.name.string(), to_socket_name.string())) input = in; if(!input) |