[Bf-blender-cvs] [5eeea18] temp-cycles-microdisplacement: Fix build error on older compilers

Mai Lavelle noreply at git.blender.org
Sat Jun 25 16:12:12 CEST 2016


Commit: 5eeea18fe3f73bc8e53421a9fe68c98defc5fb6d
Author: Mai Lavelle
Date:   Sat Jun 25 10:11:24 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rB5eeea18fe3f73bc8e53421a9fe68c98defc5fb6d

Fix build error on older compilers

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

M	intern/cycles/render/mesh_subdivision.cpp

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

diff --git a/intern/cycles/render/mesh_subdivision.cpp b/intern/cycles/render/mesh_subdivision.cpp
index 31d19bc..5ce6d49 100644
--- a/intern/cycles/render/mesh_subdivision.cpp
+++ b/intern/cycles/render/mesh_subdivision.cpp
@@ -35,7 +35,9 @@ CCL_NAMESPACE_END
 
 /* specializations of TopologyRefinerFactory for ccl::Mesh */
 
-namespace OpenSubdiv::OPENSUBDIV_VERSION::Far {
+namespace OpenSubdiv {
+namespace OPENSUBDIV_VERSION {
+namespace Far {
 	template<>
 	bool TopologyRefinerFactory<ccl::Mesh>::resizeComponentTopology(TopologyRefiner& refiner, ccl::Mesh const& mesh)
 	{
@@ -86,7 +88,9 @@ namespace OpenSubdiv::OPENSUBDIV_VERSION::Far {
 		char const */*msg*/, ccl::Mesh const& /*mesh*/)
 	{
 	}
-}
+} /* namespace Far */
+} /* namespace OPENSUBDIV_VERSION */
+} /* namespace OpenSubdiv */
 
 CCL_NAMESPACE_BEGIN




More information about the Bf-blender-cvs mailing list