[Bf-blender-cvs] [bc597eb4878] master: Fix T49589: 2.78 VSE no longer caching Node Editor scene strips
Richard Antalik
noreply at git.blender.org
Wed May 1 14:40:27 CEST 2019
Commit: bc597eb4878913097fff0a973497e3900a7d8908
Author: Richard Antalik
Date: Wed May 1 05:16:01 2019 -0700
Branches: master
https://developer.blender.org/rBbc597eb4878913097fff0a973497e3900a7d8908
Fix T49589: 2.78 VSE no longer caching Node Editor scene strips
Sequencer cache was cleared when rendering compositor output.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D4758
===================================================================
M source/blender/blenkernel/BKE_sequencer.h
M source/blender/blenkernel/intern/sequencer.c
M source/blender/render/intern/source/pipeline.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index 84d26bd1db9..017c15ebe41 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -566,6 +566,6 @@ void BKE_sequencer_color_balance_apply(struct StripColorBalance *cb,
bool make_float,
struct ImBuf *mask_input);
-void BKE_sequencer_all_free_anim_ibufs(struct Main *bmain, int cfra);
+void BKE_sequencer_all_free_anim_ibufs(struct Scene *scene, int cfra);
#endif /* __BKE_SEQUENCER_H__ */
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 85b915874ca..1e492499670 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -5999,15 +5999,12 @@ static void sequencer_all_free_anim_ibufs(ListBase *seqbase, int cfra)
}
}
-void BKE_sequencer_all_free_anim_ibufs(Main *bmain, int cfra)
+void BKE_sequencer_all_free_anim_ibufs(Scene *scene, int cfra)
{
- for (Scene *scene = bmain->scenes.first; scene != NULL; scene = scene->id.next) {
- Editing *ed = BKE_sequencer_editing_get(scene, false);
- if (ed == NULL) {
- /* Ignore scenes without sequencer. */
- continue;
- }
- sequencer_all_free_anim_ibufs(&ed->seqbase, cfra);
- BKE_sequencer_cache_cleanup(scene);
+ Editing *ed = BKE_sequencer_editing_get(scene, false);
+ if (ed == NULL) {
+ return;
}
+ sequencer_all_free_anim_ibufs(&ed->seqbase, cfra);
+ BKE_sequencer_cache_cleanup(scene);
}
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index cfe7f4923a0..7d3002ea71d 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1693,7 +1693,7 @@ static void do_render_all_options(Render *re)
/* ensure no images are in memory from previous animated sequences */
BKE_image_all_free_anim_ibufs(re->main, re->r.cfra);
- BKE_sequencer_all_free_anim_ibufs(re->main, re->r.cfra);
+ BKE_sequencer_all_free_anim_ibufs(re->scene, re->r.cfra);
/* Update for sequencer and compositing animation.
* TODO: ideally we would create a depsgraph with a copy of the scene
More information about the Bf-blender-cvs
mailing list