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

Fix cycles-xml with OSL support after changes inroduced in 1422f0dd16

Browse Source
This commit is contained in:
Martijn Berger
2016-05-07 10:50:21 +02:00
parent 4422b3f919
commit 0a277f7428
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/app/cycles_xml.cpp
View File

@@ -437,7 +437,7 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
/* Generate inputs/outputs from node sockets /* Generate inputs/outputs from node sockets
* *
* Note: ShaderInput/ShaderOutput store shallow string copies only! * 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 */ /* read input values */
for(pugi::xml_node param = node.first_child(); param; param = param.next_sibling()) { for(pugi::xml_node param = node.first_child(); param; param = param.next_sibling()) {
if(string_iequals(param.name(), "input")) { 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) if(type == SHADER_SOCKET_UNDEFINED)
continue; continue;
osl->input_names.push_back(ustring(name)); osl->add_input(ustring(name).c_str(), type);
osl->add_input(osl->input_names.back().c_str(), type);
} }
else if(string_iequals(param.name(), "output")) { else if(string_iequals(param.name(), "output")) {
string name; string name;
@@ -461,8 +460,7 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
if(type == SHADER_SOCKET_UNDEFINED) if(type == SHADER_SOCKET_UNDEFINED)
continue; continue;
osl->output_names.push_back(ustring(name)); osl->add_output(ustring(name).c_str(), type);
osl->add_output(osl->output_names.back().c_str(), type);
} }
} }