griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Cycles debug build assert on some platforms, tighten checks to avoid this in the future.

Browse Source
This commit is contained in:
Brecht Van Lommel
2016-06-12 17:12:25 +02:00
parent 055001111e
commit 24d53f79b2
13 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/graph/node_xml.cpp
View File

@@ -108,6 +108,11 @@ void xml_read_node(XMLReader& reader, Node *node, pugi::xml_node xml_node)
node->set(socket, (int)atoi(attr.value()));
break;
}
case SocketType::UINT:
{
node->set(socket, (uint)atoi(attr.value()));
break;
}
case SocketType::INT_ARRAY:
{
vector<string> tokens;
@@ -310,6 +315,11 @@ pugi::xml_node xml_write_node(Node *node, pugi::xml_node xml_root)
attr = node->get_int(socket);
break;
}
case SocketType::UINT:
{
attr = node->get_uint(socket);
break;
}
case SocketType::INT_ARRAY:
{
std::stringstream ss;