diff options
Diffstat (limited to 'source/blender/depsgraph')
56 files changed, 138 insertions, 258 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc index 39de6054615..e4660c34762 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder.cc @@ -50,8 +50,7 @@ #include "DEG_depsgraph.h" -namespace blender { -namespace deg { +namespace blender::deg { bool deg_check_id_in_depsgraph(const Depsgraph *graph, ID *id_orig) { @@ -241,5 +240,4 @@ void deg_graph_build_finalize(Main *bmain, Depsgraph *graph) } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cache.cc b/source/blender/depsgraph/intern/builder/deg_builder_cache.cc index 717239d7c64..df108072142 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cache.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_cache.cc @@ -31,8 +31,7 @@ #include "BKE_animsys.h" -namespace blender { -namespace deg { +namespace blender::deg { /* Animated property storage. */ @@ -178,5 +177,4 @@ AnimatedPropertyStorage *DepsgraphBuilderCache::ensureInitializedAnimatedPropert return animated_property_storage; } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc index 6fb11c5b91e..dbc8bbd31fa 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc @@ -37,8 +37,7 @@ #include "intern/depsgraph.h" #include "intern/depsgraph_relation.h" -namespace blender { -namespace deg { +namespace blender::deg { namespace { @@ -235,5 +234,4 @@ void deg_graph_detect_cycles(Depsgraph *graph) } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_map.cc b/source/blender/depsgraph/intern/builder/deg_builder_map.cc index e605e83a862..5da54350cfc 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_map.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_map.cc @@ -25,8 +25,7 @@ #include "DNA_ID.h" -namespace blender { -namespace deg { +namespace blender::deg { BuilderMap::BuilderMap() { @@ -59,5 +58,4 @@ int BuilderMap::getIDTag(ID *id) const return id_tags_.lookup_default(id, 0); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 7f9a745c1a4..9cae343dcde 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -96,7 +96,6 @@ #include "BKE_pointcache.h" #include "BKE_rigidbody.h" #include "BKE_scene.h" -#include "BKE_sequencer.h" #include "BKE_shader_fx.h" #include "BKE_simulation.h" #include "BKE_sound.h" @@ -110,6 +109,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" +#include "SEQ_sequencer.h" + #include "intern/builder/deg_builder.h" #include "intern/depsgraph.h" #include "intern/depsgraph_type.h" @@ -119,8 +120,7 @@ #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" -namespace blender { -namespace deg { +namespace blender::deg { /* ************ */ /* Node Builder */ @@ -1199,7 +1199,7 @@ void DepsgraphNodeBuilder::build_particle_systems(Object *object, bool is_object /* Keyed particle targets. */ if (ELEM(part->phystype, PART_PHYS_KEYED, PART_PHYS_BOIDS)) { LISTBASE_FOREACH (ParticleTarget *, particle_target, &psys->targets) { - if (particle_target->ob == nullptr || particle_target->ob == object) { + if (ELEM(particle_target->ob, nullptr, object)) { continue; } build_object(-1, particle_target->ob, DEG_ID_LINKED_INDIRECTLY, is_object_visible); @@ -1929,5 +1929,4 @@ void DepsgraphNodeBuilder::constraint_walk(bConstraint * /*con*/, } } -} // namespace deg -} // namespace blender +} // namespace blender::deg 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 6143b4472d7..eb70760e556 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc @@ -54,8 +54,7 @@ #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_operation.h" -namespace blender { -namespace deg { +namespace blender::deg { void DepsgraphNodeBuilder::build_pose_constraints(Object *object, bPoseChannel *pchan, @@ -350,5 +349,4 @@ void DepsgraphNodeBuilder::build_proxy_rig(Object *object, bool is_object_visibl op_node->set_as_exit(); } -} // namespace deg -} // namespace blender +} // namespace blender::deg 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 fd457e0b2bf..21a32b0d005 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc @@ -25,8 +25,7 @@ #include "DNA_scene_types.h" -namespace blender { -namespace deg { +namespace blender::deg { void DepsgraphNodeBuilder::build_scene_render(Scene *scene, ViewLayer *view_layer) { @@ -88,5 +87,4 @@ void DepsgraphNodeBuilder::build_scene_compositor(Scene *scene) build_nodetree(scene->nodetree); } -} // namespace deg -} // namespace blender +} // namespace blender::deg 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 1d6712d16ef..7a6dc6e2315 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,8 +55,7 @@ #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_operation.h" -namespace blender { -namespace deg { +namespace blender::deg { void DepsgraphNodeBuilder::build_layer_collections(ListBase *lb) { @@ -175,5 +174,4 @@ void DepsgraphNodeBuilder::build_view_layer(Scene *scene, } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc index 924088cbc13..4406cc83a0d 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc @@ -28,8 +28,7 @@ #include "BLI_utildefines.h" -namespace blender { -namespace deg { +namespace blender::deg { RootPChanMap::RootPChanMap() { @@ -78,5 +77,4 @@ bool RootPChanMap::has_common_root(const char *bone1, const char *bone2) const return Set<StringRefNull>::Intersects(*bone1_roots, *bone2_roots); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index bac36885dfc..a55966632d8 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -89,7 +89,6 @@ #include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_rigidbody.h" -#include "BKE_sequencer.h" #include "BKE_shader_fx.h" #include "BKE_shrinkwrap.h" #include "BKE_sound.h" @@ -99,6 +98,8 @@ #include "RNA_access.h" #include "RNA_types.h" +#include "SEQ_sequencer.h" + #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -119,8 +120,7 @@ #include "intern/depsgraph_relation.h" #include "intern/depsgraph_type.h" -namespace blender { -namespace deg { +namespace blender::deg { /* ***************** */ /* Relations Builder */ @@ -742,7 +742,7 @@ void DepsgraphRelationBuilder::build_object_proxy_from(Object *object) void DepsgraphRelationBuilder::build_object_proxy_group(Object *object) { - if (object->proxy_group == nullptr || object->proxy_group == object->proxy) { + if (ELEM(object->proxy_group, nullptr, object->proxy)) { return; } /* Object is local here (local in .blend file, users interacts with it). */ @@ -1233,7 +1233,7 @@ void DepsgraphRelationBuilder::build_constraints(ID *id, } } if (cti->flush_constraint_targets) { - cti->flush_constraint_targets(con, &targets, 1); + cti->flush_constraint_targets(con, &targets, true); } } } @@ -1853,7 +1853,7 @@ void DepsgraphRelationBuilder::build_particle_systems(Object *object) /* Keyed particle targets. */ if (ELEM(part->phystype, PART_PHYS_KEYED, PART_PHYS_BOIDS)) { LISTBASE_FOREACH (ParticleTarget *, particle_target, &psys->targets) { - if (particle_target->ob == nullptr || particle_target->ob == object) { + if (ELEM(particle_target->ob, nullptr, object)) { continue; } /* Make sure target object is pulled into the graph. */ @@ -2203,7 +2203,7 @@ void DepsgraphRelationBuilder::build_object_data_geometry_datablock(ID *obdata) /* Layer parenting need react to the parent object transformation. */ LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) { - if (gpl->parent != NULL) { + if (gpl->parent != nullptr) { ComponentKey gpd_geom_key(&gpd->id, NodeType::GEOMETRY); if (gpl->partype == PARBONE) { @@ -2813,8 +2813,7 @@ void DepsgraphRelationBuilder::build_copy_on_write_relations(IDNode *id_node) * to preserve that cache in copy-on-write, but for the time being * we allow flush to layer collections component which will ensure * that cached array of bases exists and is up-to-date. */ - if (comp_node->type == NodeType::PARAMETERS || - comp_node->type == NodeType::LAYER_COLLECTIONS) { + if (ELEM(comp_node->type, NodeType::PARAMETERS, NodeType::LAYER_COLLECTIONS)) { rel_flag &= ~RELATION_FLAG_NO_FLUSH; } /* All entry operations of each component should wait for a proper @@ -2926,5 +2925,4 @@ void DepsgraphRelationBuilder::constraint_walk(bConstraint * /*con*/, data->builder->build_id(id); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.cc index 717c8300f9b..b9ce29ce8d2 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.cc @@ -35,13 +35,10 @@ #include "intern/depsgraph_relation.h" #include "intern/node/deg_node.h" -namespace blender { -namespace deg { +namespace blender::deg { DriverDescriptor::DriverDescriptor(PointerRNA *id_ptr, FCurve *fcu) - : rna_prefix(), - rna_suffix(), - id_ptr_(id_ptr), + : id_ptr_(id_ptr), fcu_(fcu), driver_relations_needed_(false), pointer_rna_(), @@ -254,5 +251,4 @@ void DepsgraphRelationBuilder::build_driver_relations(IDNode *id_node) } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc index 2220ba6ee13..e0a7a42ea4a 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc @@ -25,8 +25,7 @@ #include "intern/builder/deg_builder_relations.h" -namespace blender { -namespace deg { +namespace blender::deg { //////////////////////////////////////////////////////////////////////////////// // Time source. @@ -193,5 +192,4 @@ string RNAPathKey::identifier() const return string("RnaPathKey(") + "id: " + id_name + ", prop: '" + prop_name + "')"; } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc index 4c765152a2b..39a60c9029c 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc @@ -58,8 +58,7 @@ #include "intern/depsgraph_relation.h" #include "intern/depsgraph_type.h" -namespace blender { -namespace deg { +namespace blender::deg { /* IK Solver Eval Steps */ void DepsgraphRelationBuilder::build_ik_pose(Object *object, @@ -510,5 +509,4 @@ void DepsgraphRelationBuilder::build_proxy_rig(Object *object) } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc index 703c6c7cd68..74948a336e9 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc @@ -25,8 +25,7 @@ #include "DNA_scene_types.h" -namespace blender { -namespace deg { +namespace blender::deg { void DepsgraphRelationBuilder::build_scene_render(Scene *scene, ViewLayer *view_layer) { @@ -76,5 +75,4 @@ void DepsgraphRelationBuilder::build_scene_compositor(Scene *scene) build_nodetree(scene->nodetree); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc index 6e64eba60dc..b58d4a22712 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc @@ -56,8 +56,7 @@ #include "intern/depsgraph_type.h" -namespace blender { -namespace deg { +namespace blender::deg { void DepsgraphRelationBuilder::build_layer_collections(ListBase *lb) { @@ -154,5 +153,4 @@ void DepsgraphRelationBuilder::build_view_layer(Scene *scene, } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc b/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc index 8d51fa1422a..77d1a89c256 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc @@ -33,8 +33,7 @@ #include "intern/depsgraph_relation.h" #include "intern/depsgraph_type.h" -namespace blender { -namespace deg { +namespace blender::deg { static inline bool is_unused_noop(OperationNode *op_node) { @@ -85,5 +84,4 @@ void deg_graph_remove_unused_noops(Depsgraph *graph) (::Depsgraph *)graph, BUILD, "Removed %d relations to no-op nodes\n", num_removed_relations); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc index 18b24179edf..4064058f231 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc @@ -48,8 +48,7 @@ #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" -namespace blender { -namespace deg { +namespace blender::deg { /* ********************************* ID Data ******************************** */ @@ -209,8 +208,7 @@ RNANodeIdentifier RNANodeQuery::construct_node_identifier(const PointerRNA *ptr, } } /* Final transform properties go to the Done node for the exit. */ - else if (STREQ(prop_name, "head") || STREQ(prop_name, "tail") || - STREQ(prop_name, "length") || STRPREFIX(prop_name, "matrix")) { + else if (STR_ELEM(prop_name, "head", "tail", "length") || STRPREFIX(prop_name, "matrix")) { if (source == RNAPointerSource::EXIT) { node_identifier.operation_code = OperationCode::BONE_DONE; } @@ -325,7 +323,7 @@ RNANodeIdentifier RNANodeQuery::construct_node_identifier(const PointerRNA *ptr, node_identifier.type = NodeType::GEOMETRY; return node_identifier; } - if (STREQ(prop_identifier, "hide_viewport") || STREQ(prop_identifier, "hide_render")) { + if (STR_ELEM(prop_identifier, "hide_viewport", "hide_render")) { node_identifier.type = NodeType::OBJECT_FROM_LAYER; return node_identifier; } @@ -401,5 +399,4 @@ RNANodeQueryIDData *RNANodeQuery::ensure_id_data(const ID *id) return id_data.get(); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc index c91dda87190..b7a5aa7c171 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_rna_test.cc @@ -25,9 +25,7 @@ #include "testing/testing.h" -namespace blender { -namespace deg { -namespace tests { +namespace blender::deg::tests { class TestableRNANodeQuery : public RNANodeQuery { public: @@ -55,6 +53,4 @@ TEST(deg_builder_rna, contains) EXPECT_FALSE(TestableRNANodeQuery::contains("pose.bone[\"location\"].scale[0]", "location")); } -} // namespace tests -} // namespace deg -} // namespace blender +} // namespace blender::deg::tests diff --git a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc index c5e020b3242..c30778e7a91 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc @@ -33,8 +33,7 @@ #include "intern/depsgraph.h" #include "intern/depsgraph_relation.h" -namespace blender { -namespace deg { +namespace blender::deg { /* -------------------------------------------------- */ @@ -110,5 +109,4 @@ void deg_graph_transitive_reduction(Depsgraph *graph) DEG_DEBUG_PRINTF((::Depsgraph *)graph, BUILD, "Removed %d relations\n", num_removed_relations); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/pipeline.cc b/source/blender/depsgraph/intern/builder/pipeline.cc index b13077e4792..f7feeea9593 100644 --- a/source/blender/depsgraph/intern/builder/pipeline.cc +++ b/source/blender/depsgraph/intern/builder/pipeline.cc @@ -30,15 +30,13 @@ #include "deg_builder_relations.h" #include "deg_builder_transitive.h" -namespace blender { -namespace deg { +namespace blender::deg { AbstractBuilderPipeline::AbstractBuilderPipeline(::Depsgraph *graph) : deg_graph_(reinterpret_cast<Depsgraph *>(graph)), bmain_(deg_graph_->bmain), scene_(deg_graph_->scene), - view_layer_(deg_graph_->view_layer), - builder_cache_() + view_layer_(deg_graph_->view_layer) { } @@ -125,5 +123,4 @@ unique_ptr<DepsgraphRelationBuilder> AbstractBuilderPipeline::construct_relation return std::make_unique<DepsgraphRelationBuilder>(bmain_, deg_graph_, &builder_cache_); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc b/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc index 81d239239be..d02aa16f26b 100644 --- a/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc +++ b/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc @@ -25,8 +25,7 @@ #include "DNA_layer_types.h" -namespace blender { -namespace deg { +namespace blender::deg { namespace { @@ -73,5 +72,4 @@ unique_ptr<DepsgraphRelationBuilder> AllObjectsBuilderPipeline::construct_relati return std::make_unique<AllObjectsRelationBuilder>(bmain_, deg_graph_, &builder_cache_); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/pipeline_compositor.cc b/source/blender/depsgraph/intern/builder/pipeline_compositor.cc index 2b9922851c1..5fa9788cf72 100644 --- a/source/blender/depsgraph/intern/builder/pipeline_compositor.cc +++ b/source/blender/depsgraph/intern/builder/pipeline_compositor.cc @@ -23,8 +23,7 @@ #include "intern/builder/deg_builder_relations.h" #include "intern/depsgraph.h" -namespace blender { -namespace deg { +namespace blender::deg { CompositorBuilderPipeline::CompositorBuilderPipeline(::Depsgraph *graph, bNodeTree *nodetree) : AbstractBuilderPipeline(graph), nodetree_(nodetree) @@ -44,5 +43,4 @@ void CompositorBuilderPipeline::build_relations(DepsgraphRelationBuilder &relati relation_builder.build_nodetree(nodetree_); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/pipeline_from_ids.cc b/source/blender/depsgraph/intern/builder/pipeline_from_ids.cc index 87cfeb46693..5fd4a0fc3dd 100644 --- a/source/blender/depsgraph/intern/builder/pipeline_from_ids.cc +++ b/source/blender/depsgraph/intern/builder/pipeline_from_ids.cc @@ -25,8 +25,7 @@ #include "intern/builder/deg_builder_relations.h" #include "intern/depsgraph.h" -namespace blender { -namespace deg { +namespace blender::deg { namespace { @@ -146,5 +145,4 @@ void FromIDsBuilderPipeline::build_relations(DepsgraphRelationBuilder &relation_ } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/pipeline_render.cc b/source/blender/depsgraph/intern/builder/pipeline_render.cc index 3b065f7f1bc..9b40e4644a2 100644 --- a/source/blender/depsgraph/intern/builder/pipeline_render.cc +++ b/source/blender/depsgraph/intern/builder/pipeline_render.cc @@ -23,8 +23,7 @@ #include "intern/builder/deg_builder_relations.h" #include "intern/depsgraph.h" -namespace blender { -namespace deg { +namespace blender::deg { RenderBuilderPipeline::RenderBuilderPipeline(::Depsgraph *graph) : AbstractBuilderPipeline(graph) { @@ -41,5 +40,4 @@ void RenderBuilderPipeline::build_relations(DepsgraphRelationBuilder &relation_b relation_builder.build_scene_render(scene_, view_layer_); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/builder/pipeline_view_layer.cc b/source/blender/depsgraph/intern/builder/pipeline_view_layer.cc index f1852a40a10..5ae577ab031 100644 --- a/source/blender/depsgraph/intern/builder/pipeline_view_layer.cc +++ b/source/blender/depsgraph/intern/builder/pipeline_view_layer.cc @@ -23,8 +23,7 @@ #include "intern/builder/deg_builder_relations.h" #include "intern/depsgraph.h" -namespace blender { -namespace deg { +namespace blender::deg { ViewLayerBuilderPipeline::ViewLayerBuilderPipeline(::Depsgraph *graph) : AbstractBuilderPipeline(graph) @@ -41,5 +40,4 @@ void ViewLayerBuilderPipeline::build_relations(DepsgraphRelationBuilder &relatio relation_builder.build_view_layer(scene_, view_layer_, DEG_ID_LINKED_DIRECTLY); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/debug/deg_debug.cc b/source/blender/depsgraph/intern/debug/deg_debug.cc index ab6adea6416..47c97211886 100644 --- a/source/blender/depsgraph/intern/debug/deg_debug.cc +++ b/source/blender/depsgraph/intern/debug/deg_debug.cc @@ -32,8 +32,7 @@ #include "BKE_global.h" -namespace blender { -namespace deg { +namespace blender::deg { DepsgraphDebug::DepsgraphDebug() : flags(G.debug), is_ever_evaluated(false), graph_evaluation_start_time_(0) @@ -73,7 +72,7 @@ void DepsgraphDebug::end_graph_evaluation() is_ever_evaluated = true; } -bool terminal_do_color(void) +bool terminal_do_color() { return (G.debug & G_DEBUG_DEPSGRAPH_PRETTY) != 0; } @@ -90,7 +89,7 @@ string color_for_pointer(const void *pointer) return string(buffer); } -string color_end(void) +string color_end() { if (!terminal_do_color()) { return ""; @@ -98,5 +97,4 @@ string color_end(void) return string(TRUECOLOR_ANSI_COLOR_FINISH); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc index 04b25a36d6d..a0cbbbc163d 100644 --- a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc +++ b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc @@ -47,8 +47,7 @@ namespace dot = blender::dot; /* ****************** */ /* Graphviz Debugging */ -namespace blender { -namespace deg { +namespace blender::deg { /* Only one should be enabled, defines whether graphviz nodes * get colored by individual types or classes. @@ -510,8 +509,7 @@ static void deg_debug_graphviz_graph_relations(DotExportContext &ctx, const Deps } } -} // namespace deg -} // namespace blender +} // namespace blender::deg void DEG_debug_relations_graphviz(const Depsgraph *graph, FILE *fp, const char *label) { diff --git a/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc b/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc index 42c1fcba1bb..0cdd627dd44 100644 --- a/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc +++ b/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc @@ -38,8 +38,7 @@ namespace deg = blender::deg; -namespace blender { -namespace deg { +namespace blender::deg { namespace { struct DebugContext { @@ -149,8 +148,7 @@ void deg_debug_stats_gnuplot(const DebugContext &ctx) } } // namespace -} // namespace deg -} // namespace blender +} // namespace blender::deg void DEG_debug_stats_gnuplot(const Depsgraph *depsgraph, FILE *fp, diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 99804a7cd7d..870a6d3fce8 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -57,8 +57,7 @@ namespace deg = blender::deg; -namespace blender { -namespace deg { +namespace blender::deg { Depsgraph::Depsgraph(Main *bmain, Scene *scene, ViewLayer *view_layer, eEvaluationMode mode) : time_source(nullptr), @@ -263,8 +262,7 @@ ID *Depsgraph::get_cow_id(const ID *id_orig) const return id_node->id_cow; } -} // namespace deg -} // namespace blender +} // namespace blender::deg /* **************** */ /* Public Graph API */ @@ -287,7 +285,7 @@ void DEG_graph_replace_owners(struct Depsgraph *depsgraph, deg::Depsgraph *deg_graph = reinterpret_cast<deg::Depsgraph *>(depsgraph); const bool do_update_register = deg_graph->bmain != bmain; - if (do_update_register && deg_graph->bmain != NULL) { + if (do_update_register && deg_graph->bmain != nullptr) { deg::unregister_graph(deg_graph); } diff --git a/source/blender/depsgraph/intern/depsgraph_physics.cc b/source/blender/depsgraph/intern/depsgraph_physics.cc index 0b8203ab05f..8f3aab19e37 100644 --- a/source/blender/depsgraph/intern/depsgraph_physics.cc +++ b/source/blender/depsgraph/intern/depsgraph_physics.cc @@ -174,8 +174,7 @@ void DEG_add_forcefield_relations(DepsNodeHandle *handle, /******************************** Internal API ********************************/ -namespace blender { -namespace deg { +namespace blender::deg { ListBase *build_effector_relations(Depsgraph *graph, Collection *collection) { @@ -245,5 +244,4 @@ void clear_physics_relations(Depsgraph *graph) } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc index ebdd08ce519..ed7011ba306 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc @@ -44,8 +44,7 @@ namespace deg = blender::deg; /* ************************ DEG TRAVERSAL ********************* */ -namespace blender { -namespace deg { +namespace blender::deg { namespace { typedef deque<OperationNode *> TraversalQueue; @@ -265,8 +264,7 @@ void deg_foreach_id(const Depsgraph *depsgraph, DEGForeachIDCallback callback, v } } // namespace -} // namespace deg -} // namespace blender +} // namespace blender::deg void DEG_foreach_dependent_ID(const Depsgraph *depsgraph, const ID *id, diff --git a/source/blender/depsgraph/intern/depsgraph_registry.cc b/source/blender/depsgraph/intern/depsgraph_registry.cc index 623702ee3ae..f348ef6e6e9 100644 --- a/source/blender/depsgraph/intern/depsgraph_registry.cc +++ b/source/blender/depsgraph/intern/depsgraph_registry.cc @@ -27,8 +27,7 @@ #include "intern/depsgraph.h" -namespace blender { -namespace deg { +namespace blender::deg { using GraphRegistry = Map<Main *, VectorSet<Depsgraph *>>; static GraphRegistry &get_graph_registry() @@ -65,5 +64,4 @@ Span<Depsgraph *> get_all_registered_graphs(Main *bmain) return {}; } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/depsgraph_relation.cc b/source/blender/depsgraph/intern/depsgraph_relation.cc index d09247b03d9..904a6b56ae9 100644 --- a/source/blender/depsgraph/intern/depsgraph_relation.cc +++ b/source/blender/depsgraph/intern/depsgraph_relation.cc @@ -28,8 +28,7 @@ #include "intern/depsgraph_type.h" #include "intern/node/deg_node.h" -namespace blender { -namespace deg { +namespace blender::deg { Relation::Relation(Node *from, Node *to, const char *description) : from(from), to(to), name(description), flag(0) @@ -65,5 +64,4 @@ void Relation::unlink() to->inlinks.remove_first_occurrence_and_reorder(this); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index 868f88d8fcd..aec3dd4b9ea 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -73,8 +73,7 @@ namespace deg = blender::deg; /* *********************** */ /* Update Tagging/Flushing */ -namespace blender { -namespace deg { +namespace blender::deg { namespace { @@ -308,7 +307,7 @@ void depsgraph_tag_component(Depsgraph *graph, void deg_graph_id_tag_legacy_compat( Main *bmain, Depsgraph *depsgraph, ID *id, IDRecalcFlag tag, eUpdateSource update_source) { - if (tag == ID_RECALC_GEOMETRY || tag == 0) { + if (ELEM(tag, ID_RECALC_GEOMETRY, 0)) { switch (GS(id->name)) { case ID_OB: { Object *object = (Object *)id; @@ -617,7 +616,7 @@ void id_tag_update(Main *bmain, ID *id, int flag, eUpdateSource update_source) /* Accumulate all tags for an ID between two undo steps, so they can be * replayed for undo. */ - id->recalc_after_undo_push |= deg_recalc_flags_effective(NULL, flag); + id->recalc_after_undo_push |= deg_recalc_flags_effective(nullptr, flag); } void graph_id_tag_update( @@ -676,8 +675,7 @@ void graph_id_tag_update( } } -} // namespace deg -} // namespace blender +} // namespace blender::deg const char *DEG_update_tag_as_string(IDRecalcFlag flag) { diff --git a/source/blender/depsgraph/intern/depsgraph_update.cc b/source/blender/depsgraph/intern/depsgraph_update.cc index 98ff136f7bc..bb72320ca67 100644 --- a/source/blender/depsgraph/intern/depsgraph_update.cc +++ b/source/blender/depsgraph/intern/depsgraph_update.cc @@ -29,8 +29,7 @@ namespace deg = blender::deg; -namespace blender { -namespace deg { +namespace blender::deg { static DEG_EditorUpdateIDCb deg_editor_update_id_cb = nullptr; static DEG_EditorUpdateSceneCb deg_editor_update_scene_cb = nullptr; @@ -49,8 +48,7 @@ void deg_editors_scene_update(const DEGEditorUpdateContext *update_ctx, bool upd } } -} // namespace deg -} // namespace blender +} // namespace blender::deg /* Set callbacks which are being called when depsgraph changes. */ void DEG_editors_set_update_cb(DEG_EditorUpdateIDCb id_func, DEG_EditorUpdateSceneCb scene_func) diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc index 2c4b7f03db5..620e86550cc 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval.cc @@ -54,8 +54,7 @@ #include "intern/node/deg_node_operation.h" #include "intern/node/deg_node_time.h" -namespace blender { -namespace deg { +namespace blender::deg { namespace { @@ -71,7 +70,7 @@ void schedule_children(DepsgraphEvalState *state, void schedule_node_to_pool(OperationNode *node, const int UNUSED(thread_id), TaskPool *pool) { - BLI_task_pool_push(pool, deg_task_run_func, node, false, NULL); + BLI_task_pool_push(pool, deg_task_run_func, node, false, nullptr); } /* Denotes which part of dependency graph is being evaluated. */ @@ -416,5 +415,4 @@ void deg_evaluate_on_refresh(Depsgraph *graph) graph->debug.end_graph_evaluation(); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index 477dd316768..cff7292abd4 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -90,9 +90,10 @@ #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_pointcache.h" -#include "BKE_sequencer.h" #include "BKE_sound.h" +#include "SEQ_sequencer.h" + #include "intern/builder/deg_builder.h" #include "intern/builder/deg_builder_nodes.h" #include "intern/depsgraph.h" @@ -100,8 +101,7 @@ #include "intern/node/deg_node.h" #include "intern/node/deg_node_id.h" -namespace blender { -namespace deg { +namespace blender::deg { #define DEBUG_PRINT \ if (G.debug & G_DEBUG_DEPSGRAPH_EVAL) \ @@ -304,7 +304,7 @@ bool id_copy_inplace_no_main(const ID *id, ID *newid) bool result = (BKE_id_copy_ex(nullptr, (ID *)id_for_copy, &newid, - LIB_ID_COPY_LOCALIZE | LIB_ID_CREATE_NO_ALLOCATE) != NULL); + LIB_ID_COPY_LOCALIZE | LIB_ID_CREATE_NO_ALLOCATE) != nullptr); #ifdef NESTED_ID_NASTY_WORKAROUND if (result) { @@ -333,7 +333,7 @@ bool scene_copy_inplace_no_main(const Scene *scene, Scene *new_scene) bool result = (BKE_id_copy_ex(nullptr, id_for_copy, (ID **)&new_scene, - LIB_ID_COPY_LOCALIZE | LIB_ID_CREATE_NO_ALLOCATE) != NULL); + LIB_ID_COPY_LOCALIZE | LIB_ID_CREATE_NO_ALLOCATE) != nullptr); #ifdef NESTED_ID_NASTY_WORKAROUND if (result) { @@ -1126,5 +1126,4 @@ bool deg_copy_on_write_is_needed(const ID_Type id_type) return ID_TYPE_IS_COW(id_type); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc index 5ccdcbec858..fa7cfb305ee 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc @@ -69,8 +69,7 @@ // catch usage of invalid state. #undef INVALIDATE_ON_FLUSH -namespace blender { -namespace deg { +namespace blender::deg { enum { ID_STATE_NONE = 0, @@ -145,8 +144,7 @@ inline void flush_handle_component_node(IDNode *id_node, * special component where we don't want all operations to be tagged. * * TODO(sergey): Make this a more generic solution. */ - if (comp_node->type != NodeType::PARTICLE_SETTINGS && - comp_node->type != NodeType::PARTICLE_SYSTEM) { + if (!ELEM(comp_node->type, NodeType::PARTICLE_SETTINGS, NodeType::PARTICLE_SYSTEM)) { for (OperationNode *op : comp_node->operations) { op->flag |= DEPSOP_FLAG_NEEDS_UPDATE; } @@ -411,5 +409,4 @@ void deg_graph_clear_tags(Depsgraph *graph) graph->time_source->tagged_for_update = false; } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.cc index f3d9422a88b..7a0c1b5b693 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.cc @@ -29,8 +29,7 @@ #include "DRW_engine.h" -namespace blender { -namespace deg { +namespace blender::deg { RuntimeBackup::RuntimeBackup(const Depsgraph *depsgraph) : have_backup(false), @@ -117,5 +116,4 @@ void RuntimeBackup::restore_to_id(ID *id) } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc index 6c4eb8a91ee..3c0df93f4b9 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.cc @@ -32,8 +32,7 @@ #include "intern/depsgraph.h" -namespace blender { -namespace deg { +namespace blender::deg { namespace { @@ -142,5 +141,4 @@ void AnimationBackup::restore_to_id(ID *id) } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.cc index 25bcf2bfe72..0594b8a11b6 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.cc @@ -25,13 +25,11 @@ #include "DNA_modifier_types.h" -namespace blender { -namespace deg { +namespace blender::deg { ModifierDataBackup::ModifierDataBackup(ModifierData *modifier_data) : type(static_cast<ModifierType>(modifier_data->type)), runtime(modifier_data->runtime) { } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.cc index 9d3740258cc..3ee0d018782 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.cc @@ -27,8 +27,7 @@ #include "BLI_utildefines.h" -namespace blender { -namespace deg { +namespace blender::deg { MovieClipBackup::MovieClipBackup(const Depsgraph * /*depsgraph*/) { @@ -59,5 +58,4 @@ void MovieClipBackup::restore_to_movieclip(MovieClip *movieclip) reset(); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc index addee3dc539..61299a2d49c 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc @@ -32,8 +32,7 @@ #include "BKE_action.h" #include "BKE_object.h" -namespace blender { -namespace deg { +namespace blender::deg { ObjectRuntimeBackup::ObjectRuntimeBackup(const Depsgraph * /*depsgraph*/) : base_flag(0), base_local_view_bits(0) @@ -180,5 +179,4 @@ void ObjectRuntimeBackup::restore_pose_channel_runtime_data(Object *object) } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.cc index 45663378f67..e99d18b442d 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.cc @@ -22,9 +22,3 @@ */ #include "intern/eval/deg_eval_runtime_backup_pose.h" - -namespace blender { -namespace deg { - -} -} // namespace blender diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc index f000c8b5d4d..96a82c24778 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc @@ -28,8 +28,7 @@ #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" -namespace blender { -namespace deg { +namespace blender::deg { SceneBackup::SceneBackup(const Depsgraph *depsgraph) : sequencer_backup(depsgraph) { @@ -86,5 +85,4 @@ void SceneBackup::restore_to_scene(Scene *scene) reset(); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.cc index 3866a89cc17..35720140f97 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.cc @@ -25,8 +25,7 @@ #include "DNA_sequence_types.h" -namespace blender { -namespace deg { +namespace blender::deg { SequenceBackup::SequenceBackup(const Depsgraph * /*depsgraph*/) { @@ -56,5 +55,4 @@ bool SequenceBackup::isEmpty() const return (scene_sound == nullptr); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc index 4d79480a5ad..c0e284a930e 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc @@ -28,11 +28,11 @@ #include "BLI_assert.h" -#include "BKE_sequencer.h" #include "BKE_sound.h" -namespace blender { -namespace deg { +#include "SEQ_sequencer.h" + +namespace blender::deg { SequencerBackup::SequencerBackup(const Depsgraph *depsgraph) : depsgraph(depsgraph) { @@ -73,5 +73,4 @@ void SequencerBackup::restore_to_scene(Scene *scene) } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sound.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sound.cc index 4b63ada8bde..d05245a1c28 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sound.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sound.cc @@ -27,8 +27,7 @@ #include "DNA_sound_types.h" -namespace blender { -namespace deg { +namespace blender::deg { SoundBackup::SoundBackup(const Depsgraph * /*depsgraph*/) { @@ -62,5 +61,4 @@ void SoundBackup::restore_to_sound(bSound *sound) reset(); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc index 8808673ce6a..8e9fff56023 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc @@ -33,8 +33,7 @@ #include <stdio.h> -namespace blender { -namespace deg { +namespace blender::deg { VolumeBackup::VolumeBackup(const Depsgraph * /*depsgraph*/) : grids(nullptr) { @@ -58,5 +57,4 @@ void VolumeBackup::restore_to_volume(Volume *volume) } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/eval/deg_eval_stats.cc b/source/blender/depsgraph/intern/eval/deg_eval_stats.cc index 3c84c781cbb..fb627fa69c5 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_stats.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_stats.cc @@ -32,8 +32,7 @@ #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" -namespace blender { -namespace deg { +namespace blender::deg { void deg_eval_stats_aggregate(Depsgraph *graph) { @@ -55,5 +54,4 @@ void deg_eval_stats_aggregate(Depsgraph *graph) } } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/node/deg_node.cc b/source/blender/depsgraph/intern/node/deg_node.cc index 87843006347..6266acae651 100644 --- a/source/blender/depsgraph/intern/node/deg_node.cc +++ b/source/blender/depsgraph/intern/node/deg_node.cc @@ -36,8 +36,7 @@ #include "intern/node/deg_node_operation.h" #include "intern/node/deg_node_time.h" -namespace blender { -namespace deg { +namespace blender::deg { const char *nodeClassAsString(NodeClass node_class) { @@ -340,5 +339,4 @@ void deg_register_base_depsnodes() register_node_typeinfo(&DNTI_ID_REF); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/node/deg_node_component.cc b/source/blender/depsgraph/intern/node/deg_node_component.cc index 2767513d6df..6ffe5db3fec 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.cc +++ b/source/blender/depsgraph/intern/node/deg_node_component.cc @@ -38,8 +38,7 @@ #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" -namespace blender { -namespace deg { +namespace blender::deg { /* *********** */ /* Outer Nodes */ @@ -376,5 +375,4 @@ void deg_register_component_depsnodes() register_node_typeinfo(&DNTI_SIMULATION); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/node/deg_node_factory.cc b/source/blender/depsgraph/intern/node/deg_node_factory.cc index 9bb093139a1..209178f4b73 100644 --- a/source/blender/depsgraph/intern/node/deg_node_factory.cc +++ b/source/blender/depsgraph/intern/node/deg_node_factory.cc @@ -23,8 +23,7 @@ #include "intern/node/deg_node_factory.h" -namespace blender { -namespace deg { +namespace blender::deg { /* Global type registry */ static DepsNodeFactory *node_typeinfo_registry[static_cast<int>(NodeType::NUM_TYPES)] = {nullptr}; @@ -43,5 +42,4 @@ DepsNodeFactory *type_get_factory(const NodeType type) return node_typeinfo_registry[type_as_int]; } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/node/deg_node_id.cc b/source/blender/depsgraph/intern/node/deg_node_id.cc index 8d19949adc8..345da466960 100644 --- a/source/blender/depsgraph/intern/node/deg_node_id.cc +++ b/source/blender/depsgraph/intern/node/deg_node_id.cc @@ -41,8 +41,7 @@ #include "intern/node/deg_node_factory.h" #include "intern/node/deg_node_time.h" -namespace blender { -namespace deg { +namespace blender::deg { const char *linkedStateAsString(eDepsNode_LinkedState_Type linked_state) { @@ -137,7 +136,7 @@ void IDNode::destroy() } /* Free memory used by this CoW ID. */ - if (id_cow != id_orig && id_cow != nullptr) { + if (!ELEM(id_cow, id_orig, nullptr)) { deg_free_copy_on_write_datablock(id_cow); MEM_freeN(id_cow); id_cow = nullptr; @@ -213,5 +212,4 @@ IDComponentsMask IDNode::get_visible_components_mask() const return result; } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc index a32a43e2905..97aca6280be 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.cc +++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc @@ -32,8 +32,7 @@ #include "intern/node/deg_node_factory.h" #include "intern/node/deg_node_id.h" -namespace blender { -namespace deg { +namespace blender::deg { const char *operationCodeAsString(OperationCode opcode) { @@ -273,5 +272,4 @@ void deg_register_operation_depsnodes() register_node_typeinfo(&DNTI_OPERATION); } -} // namespace deg -} // namespace blender +} // namespace blender::deg diff --git a/source/blender/depsgraph/intern/node/deg_node_time.cc b/source/blender/depsgraph/intern/node/deg_node_time.cc index 4f7f70fef33..59ac4bd3d08 100644 --- a/source/blender/depsgraph/intern/node/deg_node_time.cc +++ b/source/blender/depsgraph/intern/node/deg_node_time.cc @@ -28,8 +28,7 @@ #include "intern/depsgraph.h" #include "intern/depsgraph_relation.h" -namespace blender { -namespace deg { +namespace blender::deg { void TimeSourceNode::tag_update(Depsgraph * /*graph*/, eUpdateSource /*source*/) { @@ -47,5 +46,4 @@ void TimeSourceNode::flush_update_tag(Depsgraph *graph) } } -} // namespace deg -} // namespace blender +} // namespace blender::deg |