forked from bartvdbraak/blender
Fix cycles-xml with OSL support after changes inroduced in 1422f0dd1697d7b671a7b447fd58db7dfe775821
This commit is contained in:
parent
4422b3f919
commit
0a277f7428
@ -437,7 +437,7 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
|
||||
/* Generate inputs/outputs from node sockets
|
||||
*
|
||||
* Note: ShaderInput/ShaderOutput store shallow string copies only!
|
||||
* Socket names must be stored in the extra lists instead. */
|
||||
* So we register them as ustring to ensure the pointer stays valid. */
|
||||
/* read input values */
|
||||
for(pugi::xml_node param = node.first_child(); param; param = param.next_sibling()) {
|
||||
if(string_iequals(param.name(), "input")) {
|
||||
@ -449,8 +449,7 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
|
||||
if(type == SHADER_SOCKET_UNDEFINED)
|
||||
continue;
|
||||
|
||||
osl->input_names.push_back(ustring(name));
|
||||
osl->add_input(osl->input_names.back().c_str(), type);
|
||||
osl->add_input(ustring(name).c_str(), type);
|
||||
}
|
||||
else if(string_iequals(param.name(), "output")) {
|
||||
string name;
|
||||
@ -461,8 +460,7 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
|
||||
if(type == SHADER_SOCKET_UNDEFINED)
|
||||
continue;
|
||||
|
||||
osl->output_names.push_back(ustring(name));
|
||||
osl->add_output(osl->output_names.back().c_str(), type);
|
||||
osl->add_output(ustring(name).c_str(), type);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user