Commit: cb5bfb32ba01705cf88e2c21eb61f7b9b24688da Author: Jacques Lucke Date: Mon Jun 29 15:19:56 2020 +0200 Branches: master https://developer.blender.org/rBcb5bfb32ba01705cf88e2c21eb61f7b9b24688da
Depsgraph: introduce blender::deg namespace Reviewers: sergey Differential Revision: https://developer.blender.org/D8150 =================================================================== M source/blender/depsgraph/intern/builder/deg_builder.cc M source/blender/depsgraph/intern/builder/deg_builder.h M source/blender/depsgraph/intern/builder/deg_builder_cache.cc M source/blender/depsgraph/intern/builder/deg_builder_cache.h M source/blender/depsgraph/intern/builder/deg_builder_cycle.cc M source/blender/depsgraph/intern/builder/deg_builder_cycle.h M source/blender/depsgraph/intern/builder/deg_builder_map.cc M source/blender/depsgraph/intern/builder/deg_builder_map.h M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc M source/blender/depsgraph/intern/builder/deg_builder_nodes.h M source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc M source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc M source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc M source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc M source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h M source/blender/depsgraph/intern/builder/deg_builder_relations.cc M source/blender/depsgraph/intern/builder/deg_builder_relations.h M source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h M source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc M source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc M source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc M source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc M source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc M source/blender/depsgraph/intern/builder/deg_builder_remove_noop.h M source/blender/depsgraph/intern/builder/deg_builder_rna.cc M source/blender/depsgraph/intern/builder/deg_builder_rna.h M source/blender/depsgraph/intern/builder/deg_builder_transitive.cc M source/blender/depsgraph/intern/builder/deg_builder_transitive.h M source/blender/depsgraph/intern/debug/deg_debug.cc M source/blender/depsgraph/intern/debug/deg_debug.h M source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc M source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc M source/blender/depsgraph/intern/debug/deg_time_average.h M source/blender/depsgraph/intern/depsgraph.cc M source/blender/depsgraph/intern/depsgraph.h M source/blender/depsgraph/intern/depsgraph_build.cc M source/blender/depsgraph/intern/depsgraph_debug.cc M source/blender/depsgraph/intern/depsgraph_eval.cc M source/blender/depsgraph/intern/depsgraph_physics.cc M source/blender/depsgraph/intern/depsgraph_physics.h M source/blender/depsgraph/intern/depsgraph_query.cc M source/blender/depsgraph/intern/depsgraph_query_foreach.cc M source/blender/depsgraph/intern/depsgraph_query_iter.cc M source/blender/depsgraph/intern/depsgraph_registry.cc M source/blender/depsgraph/intern/depsgraph_registry.h M source/blender/depsgraph/intern/depsgraph_relation.cc M source/blender/depsgraph/intern/depsgraph_relation.h M source/blender/depsgraph/intern/depsgraph_tag.cc M source/blender/depsgraph/intern/depsgraph_tag.h M source/blender/depsgraph/intern/depsgraph_type.cc M source/blender/depsgraph/intern/depsgraph_type.h M source/blender/depsgraph/intern/depsgraph_update.cc M source/blender/depsgraph/intern/depsgraph_update.h M source/blender/depsgraph/intern/eval/deg_eval.cc M source/blender/depsgraph/intern/eval/deg_eval.h M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h M source/blender/depsgraph/intern/eval/deg_eval_flush.cc M source/blender/depsgraph/intern/eval/deg_eval_flush.h M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.cc M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.h M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.h M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.cc M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.h M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.cc M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.h M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.cc M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.h M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.h M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.cc M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.h M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sound.cc M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sound.h M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.h M source/blender/depsgraph/intern/eval/deg_eval_stats.cc M source/blender/depsgraph/intern/eval/deg_eval_stats.h M source/blender/depsgraph/intern/node/deg_node.cc M source/blender/depsgraph/intern/node/deg_node.h M source/blender/depsgraph/intern/node/deg_node_component.cc M source/blender/depsgraph/intern/node/deg_node_component.h M source/blender/depsgraph/intern/node/deg_node_factory.cc M source/blender/depsgraph/intern/node/deg_node_factory.h M source/blender/depsgraph/intern/node/deg_node_factory_impl.h M source/blender/depsgraph/intern/node/deg_node_id.cc M source/blender/depsgraph/intern/node/deg_node_id.h M source/blender/depsgraph/intern/node/deg_node_operation.cc M source/blender/depsgraph/intern/node/deg_node_operation.h M source/blender/depsgraph/intern/node/deg_node_time.cc M source/blender/depsgraph/intern/node/deg_node_time.h =================================================================== diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc index 82f3ea7d182..39de6054615 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder.cc @@ -50,7 +50,8 @@ #include "DEG_depsgraph.h" -namespace DEG { +namespace blender { +namespace deg { bool deg_check_id_in_depsgraph(const Depsgraph *graph, ID *id_orig) { @@ -240,4 +241,5 @@ void deg_graph_build_finalize(Main *bmain, Depsgraph *graph) } } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder.h b/source/blender/depsgraph/intern/builder/deg_builder.h index 2db861b6fca..36b6b1bf17d 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder.h +++ b/source/blender/depsgraph/intern/builder/deg_builder.h @@ -29,7 +29,8 @@ struct Main; struct Object; struct bPoseChannel; -namespace DEG { +namespace blender { +namespace deg { struct Depsgraph; class DepsgraphBuilderCache; @@ -58,4 +59,5 @@ bool deg_check_id_in_depsgraph(const Depsgraph *graph, ID *id_orig); bool deg_check_base_in_depsgraph(const Depsgraph *graph, Base *base); void deg_graph_build_finalize(Main *bmain, Depsgraph *graph); -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cache.cc b/source/blender/depsgraph/intern/builder/deg_builder_cache.cc index 62d9118cbc0..2faedc4fcd6 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cache.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_cache.cc @@ -31,7 +31,8 @@ #include "BKE_animsys.h" -namespace DEG { +namespace blender { +namespace deg { /* Animated property storage. */ @@ -177,4 +178,5 @@ AnimatedPropertyStorage *DepsgraphBuilderCache::ensureInitializedAnimatedPropert return animated_property_storage; } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cache.h b/source/blender/depsgraph/intern/builder/deg_builder_cache.h index 531d1664281..6e159f55c94 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cache.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_cache.h @@ -31,7 +31,8 @@ struct ID; struct PointerRNA; struct PropertyRNA; -namespace DEG { +namespace blender { +namespace deg { class DepsgraphBuilderCache; @@ -99,4 +100,5 @@ class DepsgraphBuilderCache { Map<ID *, AnimatedPropertyStorage *> animated_property_storage_map_; }; -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc index 6deecfde9e1..f8c7737c843 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc @@ -37,7 +37,8 @@ #include "intern/depsgraph.h" #include "intern/depsgraph_relation.h" -namespace DEG { +namespace blender { +namespace deg { namespace { @@ -234,4 +235,5 @@ void deg_graph_detect_cycles(Depsgraph *graph) } } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cycle.h b/source/blender/depsgraph/intern/builder/deg_builder_cycle.h index aafdcdbea04..f9674e0e60d 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cycle.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.h @@ -23,11 +23,13 @@ #pragma once -namespace DEG { +namespace blender { +namespace deg { struct Depsgraph; /* Detect and solve dependency cycles. */ void deg_graph_detect_cycles(Depsgraph *graph); -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_map.cc b/source/blender/depsgraph/intern/builder/deg_builder_map.cc index d0bebd8b10a..e605e83a862 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_map.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_map.cc @@ -25,7 +25,8 @@ #include "DNA_ID.h" -namespace DEG { +namespace blender { +namespace deg { BuilderMap::BuilderMap() { @@ -58,4 +59,5 @@ int BuilderMap::getIDTag(ID *id) const return id_tags_.lookup_default(id, 0); } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_map.h b/source/blender/depsgraph/intern/builder/deg_builder_map.h index 54561a0c3d2..5dfc3297b3e 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_map.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_map.h @@ -27,7 +27,8 @@ struct ID; -namespace DEG { +namespace blender { +namespace deg { class BuilderMap { public: @@ -78,4 +79,5 @@ class BuilderMap { Map<ID *, int> id_tags_; }; -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index dab5c3ea911..f5cc5963253 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -119,7 +119,8 @@ #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" -namespace DEG { +namespace blender { +namespace deg { /* ************ */ /* Node Builder */ @@ -1899,4 +1900,5 @@ void DepsgraphNodeBuilder::constraint_walk(bConstraint * /*con*/, } } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h index dbe3e310d72..256fa3450a6 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h @@ -64,7 +64,8 @@ struct bNodeTree; struct bPoseChannel; struct bSound; -namespace DEG { +namespace blender { +namespace deg { struct ComponentNode; struct Depsgraph; @@ -290,4 +291,5 @@ class DepsgraphNodeBuilder : public DepsgraphBuilder { BuilderMap built_map_; }; -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc index 86abfce2deb..62282ac4d37 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc @@ -54,7 +54,8 @@ #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_operation.h" -namespace DEG { +namespace blender { +namespace deg { void DepsgraphNodeBuilder::build_pose_constraints(Object *object, bPoseChannel *pchan, @@ -344,4 +345,5 @@ void DepsgraphNodeBuilder::build_proxy_rig(Object *object, bool is_object_visibl op_node->set_as_exit(); } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc index 60e843f9124..ee40fa3f5c8 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc @@ -25,7 +25,8 @@ #include "DNA_scene_types.h" -namespace DEG { +namespace blender { +namespace deg { void DepsgraphNodeBuilder::build_scene_render(Scene *scene, ViewLayer *view_layer) { @@ -83,4 +84,5 @@ void DepsgraphNodeBuilder::build_scene_compositor(Scene *scene) build_nodetree(scene->nodetree); } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc index 58cfb36b4ab..1d6712d16ef 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc @@ -55,7 +55,8 @@ #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_operation.h" -namespace DEG { +namespace blender { +namespace deg { void DepsgraphNodeBuilder::build_layer_collections(ListBase *lb) { @@ -174,4 +175,5 @@ void DepsgraphNodeBuilder::build_view_layer(Scene *scene, } } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc index a0179181866..924088cbc13 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc @@ -28,7 +28,8 @@ #include "BLI_utildefines.h" -namespace DEG { +namespace blender { +namespace deg { RootPChanMap::RootPChanMap() { @@ -77,4 +78,5 @@ bool RootPChanMap::has_common_root(const char *bone1, const char *bone2) const return Set<StringRefNull>::Intersects(*bone1_roots, *bone2_roots); } -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h index df8b295f5bb..7a6ea38a0f0 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h @@ -25,7 +25,8 @@ #include "intern/depsgraph_type.h" -namespace DEG { +namespace blender { +namespace deg { struct RootPChanMap { /* Constructor and destructor - Create and free the internal map respectively. */ @@ -49,4 +50,5 @@ struct RootPChanMap { Map<StringRefNull, Set<StringRefNull>> map_; }; -} // namespace DEG +} // namespace deg +} // namespace blender diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index afee349cff3..71e1 @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
