diff options
Diffstat (limited to 'source/blender/depsgraph')
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index e262c880421..2669de87bc4 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -1828,7 +1828,7 @@ void DepsgraphNodeBuilder::build_scene_sequencer(Scene *scene) function_bind(BKE_scene_eval_sequencer_sequences, _1, scene_cow)); /* Make sure data for sequences is in the graph. */ Sequence *seq; - SEQ_BEGIN (scene->ed, seq) { + SEQ_ALL_BEGIN (scene->ed, seq) { build_idproperties(seq->prop); if (seq->sound != nullptr) { build_sound(seq->sound); @@ -1845,7 +1845,7 @@ void DepsgraphNodeBuilder::build_scene_sequencer(Scene *scene) } /* TODO(sergey): Movie clip, scene, camera, mask. */ } - SEQ_END; + SEQ_ALL_END; } void DepsgraphNodeBuilder::build_scene_audio(Scene *scene) diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index c0b692f28c1..6feebe6f542 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -2688,7 +2688,7 @@ void DepsgraphRelationBuilder::build_scene_sequencer(Scene *scene) ComponentKey sequencer_key(&scene->id, NodeType::SEQUENCER); Sequence *seq; bool has_audio_strips = false; - SEQ_BEGIN (scene->ed, seq) { + SEQ_ALL_BEGIN (scene->ed, seq) { build_idproperties(seq->prop); if (seq->sound != nullptr) { build_sound(seq->sound); @@ -2714,7 +2714,7 @@ void DepsgraphRelationBuilder::build_scene_sequencer(Scene *scene) } /* TODO(sergey): Movie clip, camera, mask. */ } - SEQ_END; + SEQ_ALL_END; if (has_audio_strips) { add_relation(sequencer_key, scene_audio_key, "Sequencer -> Audio"); } 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 ba7d20c0ba8..4d79480a5ad 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 @@ -41,7 +41,7 @@ SequencerBackup::SequencerBackup(const Depsgraph *depsgraph) : depsgraph(depsgra void SequencerBackup::init_from_scene(Scene *scene) { Sequence *sequence; - SEQ_BEGIN (scene->ed, sequence) { + SEQ_ALL_BEGIN (scene->ed, sequence) { SequenceBackup sequence_backup(depsgraph); sequence_backup.init_from_sequence(sequence); if (!sequence_backup.isEmpty()) { @@ -50,13 +50,13 @@ void SequencerBackup::init_from_scene(Scene *scene) sequences_backup.add(session_uuid, sequence_backup); } } - SEQ_END; + SEQ_ALL_END; } void SequencerBackup::restore_to_scene(Scene *scene) { Sequence *sequence; - SEQ_BEGIN (scene->ed, sequence) { + SEQ_ALL_BEGIN (scene->ed, sequence) { const SessionUUID &session_uuid = sequence->runtime.session_uuid; BLI_assert(BLI_session_uuid_is_generated(&session_uuid)); SequenceBackup *sequence_backup = sequences_backup.lookup_ptr(session_uuid); @@ -64,7 +64,7 @@ void SequencerBackup::restore_to_scene(Scene *scene) sequence_backup->restore_to_sequence(sequence); } } - SEQ_END; + SEQ_ALL_END; /* Cleanup audio while the scene is still known. */ for (SequenceBackup &sequence_backup : sequences_backup.values()) { if (sequence_backup.scene_sound != nullptr) { |