[Bf-blender-cvs] [3ed009a] master: Change behavior of cycles xml to conform the spec: "Each XML document has exactly one single root element"

[Martijn Berger]

Commit: 3ed009af96b158d8da1e55f50e6924cc747a6e7a
Author: Martijn Berger
Date:   Sun May 17 23:41:38 2015 +0200
Branches: master
https://developer.blender.org/rB3ed009af96b158d8da1e55f50e6924cc747a6e7a

Change behavior of cycles xml to conform the spec: "Each XML document has exactly one single root element"

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

M	intern/cycles/app/cycles_xml.cpp

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

diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 02cf146..53262b9 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -1199,7 +1199,8 @@ static void xml_read_include(const XMLReadState& state, const string& src)
 		XMLReadState substate = state;
 		substate.base = path_dirname(path);
 
-		xml_read_scene(substate, doc);
+		pugi::xml_node cycles = doc.child("cycles");
+		xml_read_scene(substate, cycles);
 	}
 	else {
 		fprintf(stderr, "%s read error: %s\n", src.c_str(), parse_result.description());