From 828bd5336be39334fde9bbfda5e64efa5ddeaaff Mon Sep 17 00:00:00 2001 From: Aras Pranckevicius Date: Tue, 22 Jul 2025 20:15:30 +0200 Subject: [PATCH] Cleanup: remove unused variables from VSE Editing struct act_imagedir and act_sounddir were added in 2009 (999d9d146ef26) but seemingly never ever used for anything. So remove that; makes Editing struct go from 3248 bytes down to 1200 bytes as well. Pull Request: https://projects.blender.org/blender/blender/pulls/142846 --- .../space_sequencer/sequencer_select.cc | 25 ------------------- source/blender/makesdna/DNA_sequence_types.h | 3 --- source/blender/sequencer/intern/strip_add.cc | 4 --- 3 files changed, 32 deletions(-) diff --git a/source/blender/editors/space_sequencer/sequencer_select.cc b/source/blender/editors/space_sequencer/sequencer_select.cc index b4050d8a731..2910dc5a272 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.cc +++ b/source/blender/editors/space_sequencer/sequencer_select.cc @@ -288,24 +288,12 @@ void select_surround_from_last(Scene *scene) void select_strip_single(Scene *scene, Strip *strip, bool deselect_all) { - Editing *ed = seq::editing_get(scene); - if (deselect_all) { deselect_all_strips(scene); } seq::select_active_set(scene, strip); - if (ELEM(strip->type, STRIP_TYPE_IMAGE, STRIP_TYPE_MOVIE)) { - if (strip->data) { - BLI_strncpy(ed->act_imagedir, strip->data->dirpath, FILE_MAXDIR); - } - } - else if (strip->type == STRIP_TYPE_SOUND_RAM) { - if (strip->data) { - BLI_strncpy(ed->act_sounddir, strip->data->dirpath, FILE_MAXDIR); - } - } strip->flag |= SELECT; recurs_sel_strip(strip); } @@ -563,20 +551,7 @@ void SEQUENCER_OT_select_inverse(wmOperatorType *ot) static void sequencer_select_set_active(Scene *scene, Strip *strip) { - Editing *ed = seq::editing_get(scene); - seq::select_active_set(scene, strip); - - if (ELEM(strip->type, STRIP_TYPE_IMAGE, STRIP_TYPE_MOVIE)) { - if (strip->data) { - BLI_strncpy(ed->act_imagedir, strip->data->dirpath, FILE_MAXDIR); - } - } - else if (strip->type == STRIP_TYPE_SOUND_RAM) { - if (strip->data) { - BLI_strncpy(ed->act_sounddir, strip->data->dirpath, FILE_MAXDIR); - } - } recurs_sel_strip(strip); } diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index e9e1ee7db66..e9f864322ec 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -348,10 +348,7 @@ typedef struct Editing { ListBase metastack; ListBase channels; /* SeqTimelineChannel */ - /* Context vars, used to be static */ Strip *act_strip; - char act_imagedir[/*FILE_MAX*/ 1024]; - char act_sounddir[/*FILE_MAX*/ 1024]; char proxy_dir[/*FILE_MAX*/ 1024]; int proxy_storage; diff --git a/source/blender/sequencer/intern/strip_add.cc b/source/blender/sequencer/intern/strip_add.cc index 30ce040fde5..af2aa5156e7 100644 --- a/source/blender/sequencer/intern/strip_add.cc +++ b/source/blender/sequencer/intern/strip_add.cc @@ -276,8 +276,6 @@ Strip *add_image_strip(Main *bmain, Scene *scene, ListBase *seqbase, LoadData *l IMB_freeImBuf(ibuf); } - /* Set Last active directory. */ - STRNCPY(scene->ed->act_imagedir, strip->data->dirpath); strip_add_set_view_transform(scene, strip, load_data); strip_add_set_name(scene, strip, load_data); strip_add_generic_update(scene, strip); @@ -350,8 +348,6 @@ Strip *add_sound_strip(Main *bmain, Scene *scene, ListBase *seqbase, LoadData *l strip->flag |= SEQ_AUDIO_DRAW_WAVEFORM; } - /* Set Last active directory. */ - BLI_strncpy(scene->ed->act_sounddir, data->dirpath, FILE_MAXDIR); strip_add_set_name(scene, strip, load_data); strip_add_generic_update(scene, strip);