[Bf-blender-cvs] [58677609ee3] soc-2021-vse-strip-thumbnails: Fix error on proxy building with thumbnail job and improve performance
Aditya Y Jeppu
noreply at git.blender.org
Mon Aug 2 19:09:08 CEST 2021
Commit: 58677609ee3241eefa9f693bec872c0ad9c3e796
Author: Aditya Y Jeppu
Date: Mon Aug 2 22:38:01 2021 +0530
Branches: soc-2021-vse-strip-thumbnails
https://developer.blender.org/rB58677609ee3241eefa9f693bec872c0ad9c3e796
Fix error on proxy building with thumbnail job and improve performance
===================================================================
M source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 05d2076db27..6a0626ce460 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1208,8 +1208,13 @@ static void thumbnail_startjob(void *data, short *stop, short *do_update, float
val = BLI_ghash_lookup(tj->seqs, seq_orig);
if (check_seq_need_thumbnails(seq_orig, tj->view_area)) {
- seq_thumbnail_get_frame_step(
- seq_orig, &frame_step, &temp_dummy, &temp_dummy, &temp_dummy, tj->pixelx, tj->pixely);
+ seq_thumbnail_get_frame_step(val->seq_dupli,
+ &frame_step,
+ &temp_dummy,
+ &temp_dummy,
+ &temp_dummy,
+ tj->pixelx,
+ tj->pixely);
seq_thumbnail_get_start_frame(seq_orig, frame_step, &start_frame, tj->view_area);
SEQ_render_thumbnails(
&tj->context, val->seq_dupli, seq_orig, start_frame, frame_step, tj->view_area);
@@ -1265,6 +1270,9 @@ static void sequencer_thumbnail_get_job(const bContext *C,
G.is_break = false;
WM_jobs_start(CTX_wm_manager(C), wm_job);
}
+ else {
+ WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, NULL);
+ }
ED_area_tag_redraw(area);
}
@@ -1284,6 +1292,11 @@ static void thumbnail_call_for_job(const bContext *C, Editing *ed, View2D *v2d,
if (v2d->cur.xmax != sseq->check_view_area.xmax || v2d->cur.ymax != sseq->check_view_area.ymax ||
leftover) {
+ if (v2d->cur.xmax != sseq->check_view_area.xmax ||
+ v2d->cur.ymax != sseq->check_view_area.ymax) {
+ WM_jobs_stop(CTX_wm_manager(C), NULL, thumbnail_startjob);
+ }
+
LISTBASE_FOREACH (Sequence *, seq, ed->seqbasep) {
if ((val_need_update = BLI_ghash_lookup(thumb_data_hash, seq)) == NULL &&
check_seq_need_thumbnails(seq, &v2d->cur)) {
More information about the Bf-blender-cvs
mailing list