[Bf-blender-cvs] [391f7cc406e] blender-v2.79a-release: Cycles: Fix compilation error of standalone application
Sergey Sharybin
noreply at git.blender.org
Mon Jan 8 16:55:49 CET 2018
Commit: 391f7cc406e481a07ecc4f129ef38a80252938d4
Author: Sergey Sharybin
Date: Mon Nov 13 10:49:05 2017 +0100
Branches: blender-v2.79a-release
https://developer.blender.org/rB391f7cc406e481a07ecc4f129ef38a80252938d4
Cycles: Fix compilation error of standalone application
===================================================================
M intern/cycles/app/cycles_xml.cpp
M intern/cycles/util/util_xml.h
===================================================================
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
More information about the Bf-blender-cvs
mailing list