From 5bd03f3618e31e6d62692701e51b0c47ba743066 Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Fri, 16 May 2025 16:58:58 +0200 Subject: [PATCH] VSE: Move the seq prefetch setting to the cache tab and turn on per default --- scripts/startup/bl_ui/space_sequencer.py | 8 ++++---- source/blender/blenloader/intern/versioning_defaults.cc | 4 +++- source/blender/sequencer/intern/sequencer.cc | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/startup/bl_ui/space_sequencer.py b/scripts/startup/bl_ui/space_sequencer.py index 917ef2ada9f..071778f9b22 100644 --- a/scripts/startup/bl_ui/space_sequencer.py +++ b/scripts/startup/bl_ui/space_sequencer.py @@ -2571,6 +2571,10 @@ class SEQUENCER_PT_cache_settings(SequencerButtonsPanel, Panel): ed = context.scene.sequence_editor + col = layout.column() + if ed: + col.prop(ed, "use_prefetch") + col = layout.column(heading="Cache", align=True) col.prop(ed, "use_cache_raw", text="Raw") @@ -2761,10 +2765,6 @@ class SEQUENCER_PT_view(SequencerButtonsPanel_Output, Panel): if st.proxy_render_size in {'NONE', 'SCENE'}: col.enabled = False - col = layout.column() - if ed: - col.prop(ed, "use_prefetch") - col.prop(st, "display_channel", text="Channel") if st.display_mode == 'IMAGE': diff --git a/source/blender/blenloader/intern/versioning_defaults.cc b/source/blender/blenloader/intern/versioning_defaults.cc index 54009834804..ce64c38997e 100644 --- a/source/blender/blenloader/intern/versioning_defaults.cc +++ b/source/blender/blenloader/intern/versioning_defaults.cc @@ -370,9 +370,11 @@ static void blo_update_defaults_scene(Main *bmain, Scene *scene) view_layer->passflag &= ~SCE_PASS_Z; } - /* Display missing media by default. */ if (scene->ed) { + /* Display missing media by default. */ scene->ed->show_missing_media_flag |= SEQ_EDIT_SHOW_MISSING_MEDIA; + /* Turn on frame pre-fetching per default. */ + scene->ed->cache_flag |= SEQ_CACHE_PREFETCH_ENABLE; } /* New EEVEE defaults. */ diff --git a/source/blender/sequencer/intern/sequencer.cc b/source/blender/sequencer/intern/sequencer.cc index 43e3512295d..658bc95a024 100644 --- a/source/blender/sequencer/intern/sequencer.cc +++ b/source/blender/sequencer/intern/sequencer.cc @@ -281,7 +281,7 @@ Editing *editing_ensure(Scene *scene) ed = scene->ed = MEM_callocN("addseq"); ed->seqbasep = &ed->seqbase; - ed->cache_flag = (SEQ_CACHE_STORE_FINAL_OUT | SEQ_CACHE_STORE_RAW); + ed->cache_flag = (SEQ_CACHE_PREFETCH_ENABLE | SEQ_CACHE_STORE_FINAL_OUT | SEQ_CACHE_STORE_RAW); ed->show_missing_media_flag = SEQ_EDIT_SHOW_MISSING_MEDIA; ed->displayed_channels = &ed->channels; channels_ensure(ed->displayed_channels);