[Bf-blender-cvs] [28f4388] openvdb: Merge branch 'cvdb_ray_isect' into openvdb

[Lukas Tönne]

Commit: 28f4388c2ee815998141f0e4a5a671dec27354e3
Author: Lukas Tönne
Date:   Sun Nov 13 21:42:35 2016 +0100
Branches: openvdb
https://developer.blender.org/rB28f4388c2ee815998141f0e4a5a671dec27354e3

Merge branch 'cvdb_ray_isect' into openvdb

===================================================================



===================================================================

diff --cc intern/cycles/app/cycles_xml.cpp
index e2197a3,8a3eb98..f118815
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@@ -234,14 -234,7 +234,6 @@@ static void xml_read_shader_graph(XMLRe
  	for(pugi::xml_node node = graph_node.first_child(); node; node = node.next_sibling()) {
  		ustring node_name(node.name());
  
--		if(node_name == "connect") {
- 		else if(string_iequals(node.name(), "openvdb")) {
- 			OpenVDBNode *vdbnode = new OpenVDBNode();
- 			xml_read_string(&vdbnode->filename, node, "src");
- 			vdbnode->filename = path_join(state.base, vdbnode->filename);
- 
- 			snode = vdbnode;
- 		}
  			/* connect nodes */
  			vector<string> from_tokens, to_tokens;