archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix errors in sequencer channel headers

Browse Source 
Failing constraint test uncovered crashes on NULL dereference and
missing channels initialization in `SEQ_editing_ensure()`.
This commit is contained in:
Richard Antalik
2022-04-04 16:27:37 +02:00
parent e7f4aa8f0c
commit e4289f2360
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/screen/screen_context.c
View File

@@ -647,18 +647,20 @@ static eContextResult screen_ctx_selected_editable_sequences(const bContext *C,
wmWindow *win = CTX_wm_window(C); wmWindow *win = CTX_wm_window(C);
Scene *scene = WM_window_get_active_scene(win); Scene *scene = WM_window_get_active_scene(win);
Editing *ed = SEQ_editing_get(scene); Editing *ed = SEQ_editing_get(scene);
ListBase *channels = SEQ_channels_displayed_get(ed); if (ed == NULL) {
if (ed) { return CTX_RESULT_NO_DATA;
LISTBASE_FOREACH (Sequence *, seq, ed->seqbasep) {
if (seq->flag & SELECT && !SEQ_transform_is_locked(channels, seq)) {
CTX_data_list_add(result, &scene->id, &RNA_Sequence, seq);
}
}
CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
return CTX_RESULT_OK;
} }
return CTX_RESULT_NO_DATA;
ListBase *channels = SEQ_channels_displayed_get(ed);
LISTBASE_FOREACH (Sequence *, seq, ed->seqbasep) {
if (seq->flag & SELECT && !SEQ_transform_is_locked(channels, seq)) {
CTX_data_list_add(result, &scene->id, &RNA_Sequence, seq);
}
}
CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
return CTX_RESULT_OK;
} }
static eContextResult screen_ctx_active_nla_track(const bContext *C, bContextDataResult *result) static eContextResult screen_ctx_active_nla_track(const bContext *C, bContextDataResult *result)
{ {
PointerRNA ptr; PointerRNA ptr;

5
source/blender/editors/space_sequencer/sequencer_channels_draw.c
View File

@@ -347,6 +347,11 @@ void channel_draw_context_init(const bContext *C,
void draw_channels(const bContext *C, ARegion *region) void draw_channels(const bContext *C, ARegion *region)
{ {
Editing *ed = SEQ_editing_get(CTX_data_scene(C));
if (ed == NULL) {
return;
}
SeqChannelDrawContext context; SeqChannelDrawContext context;
channel_draw_context_init(C, region, &context); channel_draw_context_init(C, region, &context);

2
source/blender/sequencer/intern/sequencer.c
View File

@@ -245,6 +245,8 @@ Editing *SEQ_editing_ensure(Scene *scene)
ed->cache = NULL; ed->cache = NULL;
ed->cache_flag = SEQ_CACHE_STORE_FINAL_OUT; ed->cache_flag = SEQ_CACHE_STORE_FINAL_OUT;
ed->cache_flag |= SEQ_CACHE_STORE_RAW; ed->cache_flag |= SEQ_CACHE_STORE_RAW;
ed->displayed_channels = &ed->channels;
SEQ_channels_ensure(ed->displayed_channels);
} }
return scene->ed; return scene->ed;