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

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Sergey Sharybin
2017-12-19 13:42:01 +01:00
parent f62de28972 b6b9351371
commit 2bbfce631d
7 changed files with 294 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/space_sequencer/sequencer_edit.c
View File

@@ -2190,23 +2190,24 @@ static int sequencer_delete_exec(bContext *C, wmOperator *UNUSED(op))
Editing *ed = BKE_sequencer_editing_get(scene, false);
Sequence *seq;
MetaStack *ms;
bool nothingSelected = true;
bool nothing_selected = true;
seq = BKE_sequencer_active_get(scene);
if (seq && seq->flag & SELECT) { /* avoid a loop since this is likely to be selected */
nothingSelected = false;
nothing_selected = false;
}
else {
for (seq = ed->seqbasep->first; seq; seq = seq->next) {
if (seq->flag & SELECT) {
nothingSelected = false;
nothing_selected = false;
break;
}
}
}
if (nothingSelected)
if (nothing_selected) {
return OPERATOR_FINISHED;
}
/* for effects and modifiers, try to find a replacement input */
for (seq = ed->seqbasep->first; seq; seq = seq->next) {