Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Antalik <richardantalik@gmail.com>2021-01-26 19:51:51 +0300
committerRichard Antalik <richardantalik@gmail.com>2021-01-26 19:51:51 +0300
commitae5c15bb4349426c5db276d7d73d750c43cc0346 (patch)
treeea8f7afa1901ff5186e6aa3b846f07945ecb19ad /source/blender/editors/space_sequencer
parentff7a557c67096fc8de870e5fb43caa17b649c538 (diff)
parent6d40d7218971b558074eb418afd244ab13ab8fbf (diff)
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_edit.c4
-rw-r--r--source/blender/editors/space_sequencer/sequencer_proxy.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index f470d1913dc..7474f8034de 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -1395,6 +1395,10 @@ static int sequencer_split_exec(bContext *C, wmOperator *op)
SEQ_prefetch_stop(scene);
+ LISTBASE_FOREACH (Sequence *, seq, ed->seqbasep) {
+ seq->tmp = NULL;
+ }
+
LISTBASE_FOREACH_BACKWARD (Sequence *, seq, ed->seqbasep) {
if (use_cursor_position && seq->machine != split_channel) {
continue;
diff --git a/source/blender/editors/space_sequencer/sequencer_proxy.c b/source/blender/editors/space_sequencer/sequencer_proxy.c
index b208f320591..b9698492aa5 100644
--- a/source/blender/editors/space_sequencer/sequencer_proxy.c
+++ b/source/blender/editors/space_sequencer/sequencer_proxy.c
@@ -168,13 +168,13 @@ static void seq_proxy_build_job(const bContext *C, ReportList *reports)
}
SEQ_CURRENT_END;
+ BLI_gset_free(file_list, MEM_freeN);
+
if (!selected) {
BKE_reportf(reports, RPT_WARNING, "Select movie or image strips");
return;
}
- BLI_gset_free(file_list, MEM_freeN);
-
if (selected && !WM_jobs_is_running(wm_job)) {
G.is_break = false;
WM_jobs_start(CTX_wm_manager(C), wm_job);