Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorMartijn Berger <martijn.berger@gmail.com>2015-05-18 00:41:38 +0300
committerMartijn Berger <martijn.berger@gmail.com>2015-05-18 00:41:38 +0300
commit3ed009af96b158d8da1e55f50e6924cc747a6e7a (patch)
tree67ea4fd328d05d4a36b7af4ea24e37d2104e16e2 /intern
parent0b5bf9d419407adfb3c7e1daca5c5b643da29231 (diff)
Change behavior of cycles xml to conform the spec: "Each XML document has exactly one single root element"
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/app/cycles_xml.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 02cf146c647..53262b93dd0 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());