diff options
author | YimingWu <xp8110@outlook.com> | 2020-12-21 10:43:03 +0300 |
---|---|---|
committer | YimingWu <xp8110@outlook.com> | 2020-12-21 10:43:03 +0300 |
commit | c5a59fba58b565334dd4a37c673f6cff1287de3e (patch) | |
tree | 2a099d0648c9bd93b98f583ebe0b9e8aab82f62c /source/blender/depsgraph | |
parent | b30687b2cae3ced060d832228e6700329d8b8c34 (diff) | |
parent | fdb7623e098fe431397815fc67667c5904074913 (diff) |
Merge remote-tracking branch 'origin/master' into lanpr-under-gp
Diffstat (limited to 'source/blender/depsgraph')
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index e5301532ddc..eb20dfb69a2 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -109,7 +109,7 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "SEQ_sequencer.h" +#include "SEQ_iterator.h" #include "intern/builder/deg_builder.h" #include "intern/depsgraph.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 68cea9060aa..abe56dec124 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -99,7 +99,7 @@ #include "RNA_access.h" #include "RNA_types.h" -#include "SEQ_sequencer.h" +#include "SEQ_iterator.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" 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 cff7292abd4..2544bb1642c 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 @@ -92,7 +92,7 @@ #include "BKE_pointcache.h" #include "BKE_sound.h" -#include "SEQ_sequencer.h" +#include "SEQ_relations.h" #include "intern/builder/deg_builder.h" #include "intern/builder/deg_builder_nodes.h" @@ -322,7 +322,7 @@ bool scene_copy_inplace_no_main(const Scene *scene, Scene *new_scene) const ID *id_for_copy = &scene->id; if (G.debug & G_DEBUG_DEPSGRAPH_UUID) { - BKE_sequencer_check_uuids_unique_and_report(scene); + SEQ_relations_check_uuids_unique_and_report(scene); } #ifdef NESTED_ID_NASTY_WORKAROUND 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 c0e284a930e..34c23740730 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 @@ -30,7 +30,7 @@ #include "BKE_sound.h" -#include "SEQ_sequencer.h" +#include "SEQ_iterator.h" namespace blender::deg { |