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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-11-13 12:49:05 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-01-08 18:49:22 +0300
commit391f7cc406e481a07ecc4f129ef38a80252938d4 (patch)
tree8876c17579710b10994024612a17f161b71a2b58
parentb6f3fec259fe7da5cec2dfe24016f91318dd53dd (diff)
Cycles: Fix compilation error of standalone application
-rw-r--r--intern/cycles/app/cycles_xml.cpp2
-rw-r--r--intern/cycles/util/util_xml.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 3a1c7205c34..f2db9271a89 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -358,7 +358,7 @@ static void xml_read_shader(XMLReadState& state, xml_node node)
/* Background */
-static void xml_read_background(XMLReadState& state, pugi::xml_node node)
+static void xml_read_background(XMLReadState& state, xml_node node)
{
/* Background Settings */
xml_read_node(state, state.scene->background, node);
diff --git a/intern/cycles/util/util_xml.h b/intern/cycles/util/util_xml.h
index c9c1ea47e96..6f06f17937b 100644
--- a/intern/cycles/util/util_xml.h
+++ b/intern/cycles/util/util_xml.h
@@ -31,8 +31,10 @@ OIIO_NAMESPACE_USING
# define PUGIXML_NAMESPACE OIIO_NAMESPACE::pugi
#endif
-using PUGIXML_NAMESPACE::xml_node;
using PUGIXML_NAMESPACE::xml_attribute;
+using PUGIXML_NAMESPACE::xml_document;
+using PUGIXML_NAMESPACE::xml_node;
+using PUGIXML_NAMESPACE::xml_parse_result;
CCL_NAMESPACE_END