diff options
Diffstat (limited to 'source/blender/depsgraph/intern/eval')
15 files changed, 44 insertions, 73 deletions
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 0bf6c38bc89..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) \ @@ -301,8 +301,10 @@ bool id_copy_inplace_no_main(const ID *id, ID *newid) id_for_copy = nested_id_hack_get_discarded_pointers(&id_hack_storage, id); #endif - bool result = BKE_id_copy_ex( - nullptr, (ID *)id_for_copy, &newid, (LIB_ID_COPY_LOCALIZE | LIB_ID_CREATE_NO_ALLOCATE)); + bool result = (BKE_id_copy_ex(nullptr, + (ID *)id_for_copy, + &newid, + LIB_ID_COPY_LOCALIZE | LIB_ID_CREATE_NO_ALLOCATE) != nullptr); #ifdef NESTED_ID_NASTY_WORKAROUND if (result) { @@ -328,8 +330,10 @@ bool scene_copy_inplace_no_main(const Scene *scene, Scene *new_scene) id_for_copy = nested_id_hack_get_discarded_pointers(&id_hack_storage, &scene->id); #endif - bool result = BKE_id_copy_ex( - nullptr, id_for_copy, (ID **)&new_scene, LIB_ID_COPY_LOCALIZE | LIB_ID_CREATE_NO_ALLOCATE); + bool result = (BKE_id_copy_ex(nullptr, + id_for_copy, + (ID **)&new_scene, + LIB_ID_COPY_LOCALIZE | LIB_ID_CREATE_NO_ALLOCATE) != nullptr); #ifdef NESTED_ID_NASTY_WORKAROUND if (result) { @@ -762,7 +766,7 @@ void update_proxy_pointers_after_copy(const Depsgraph *depsgraph, } } -/* Do some special treatment of data transfer from original ID to it's +/* Do some special treatment of data transfer from original ID to its * CoW complementary part. * * Only use for the newly created CoW data-blocks. */ @@ -1039,7 +1043,7 @@ void discard_edit_mode_pointers(ID *id_cow) /* Free content of the CoW data-block * Notes: - * - Does not recurs into nested ID data-blocks. + * - Does not recurse into nested ID data-blocks. * - Does not free data-block itself. */ void deg_free_copy_on_write_datablock(ID *id_cow) { @@ -1122,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 |