From cb5bfb32ba01705cf88e2c21eb61f7b9b24688da Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Mon, 29 Jun 2020 15:19:56 +0200 Subject: Depsgraph: introduce blender::deg namespace Reviewers: sergey Differential Revision: https://developer.blender.org/D8150 --- .../depsgraph/intern/depsgraph_query_foreach.cc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'source/blender/depsgraph/intern/depsgraph_query_foreach.cc') diff --git a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc index b68c4b91fcc..ebdd08ce519 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc @@ -40,9 +40,12 @@ #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" +namespace deg = blender::deg; + /* ************************ DEG TRAVERSAL ********************* */ -namespace DEG { +namespace blender { +namespace deg { namespace { typedef deque TraversalQueue; @@ -262,14 +265,15 @@ void deg_foreach_id(const Depsgraph *depsgraph, DEGForeachIDCallback callback, v } } // namespace -} // namespace DEG +} // namespace deg +} // namespace blender void DEG_foreach_dependent_ID(const Depsgraph *depsgraph, const ID *id, DEGForeachIDCallback callback, void *user_data) { - DEG::deg_foreach_dependent_ID((const DEG::Depsgraph *)depsgraph, id, callback, user_data); + deg::deg_foreach_dependent_ID((const deg::Depsgraph *)depsgraph, id, callback, user_data); } void DEG_foreach_dependent_ID_component(const Depsgraph *depsgraph, @@ -279,8 +283,8 @@ void DEG_foreach_dependent_ID_component(const Depsgraph *depsgraph, DEGForeachIDComponentCallback callback, void *user_data) { - DEG::deg_foreach_dependent_ID_component( - (const DEG::Depsgraph *)depsgraph, id, source_component_type, flags, callback, user_data); + deg::deg_foreach_dependent_ID_component( + (const deg::Depsgraph *)depsgraph, id, source_component_type, flags, callback, user_data); } void DEG_foreach_ancestor_ID(const Depsgraph *depsgraph, @@ -288,10 +292,10 @@ void DEG_foreach_ancestor_ID(const Depsgraph *depsgraph, DEGForeachIDCallback callback, void *user_data) { - DEG::deg_foreach_ancestor_ID((const DEG::Depsgraph *)depsgraph, id, callback, user_data); + deg::deg_foreach_ancestor_ID((const deg::Depsgraph *)depsgraph, id, callback, user_data); } void DEG_foreach_ID(const Depsgraph *depsgraph, DEGForeachIDCallback callback, void *user_data) { - DEG::deg_foreach_id((const DEG::Depsgraph *)depsgraph, callback, user_data); + deg::deg_foreach_id((const deg::Depsgraph *)depsgraph, callback, user_data); } -- cgit v1.2.3