[Bf-blender-cvs] [d1ea39aac77] master: Fix T99091: Freeze when changing strip source with thumbnails enabled

Richard Antalik noreply at git.blender.org
Thu Jun 23 17:50:07 CEST 2022


Commit: d1ea39aac77203a2f7517b3d0d2ec56ee2e30a22
Author: Richard Antalik
Date:   Thu Jun 23 17:49:26 2022 +0200
Branches: master
https://developer.blender.org/rBd1ea39aac77203a2f7517b3d0d2ec56ee2e30a22

Fix T99091: Freeze when changing strip source with thumbnails enabled

When input file is changed, `orig_height` and `orig_width` fields are
reset, which causes thumbnail dimensions to be incorrectly calculated.

Only draw thumbnails if both mentioned fields are non 0.

===================================================================

M	source/blender/editors/space_sequencer/sequencer_thumbnails.c

===================================================================

diff --git a/source/blender/editors/space_sequencer/sequencer_thumbnails.c b/source/blender/editors/space_sequencer/sequencer_thumbnails.c
index 984d3b1f374..5c929e6673a 100644
--- a/source/blender/editors/space_sequencer/sequencer_thumbnails.c
+++ b/source/blender/editors/space_sequencer/sequencer_thumbnails.c
@@ -427,6 +427,11 @@ void draw_seq_strip_thumbnail(View2D *v2d,
   float image_height, image_width, thumb_width;
   rcti crop;
 
+  StripElem *se = seq->strip->stripdata;
+  if (se->orig_height == 0 || se->orig_width == 0) {
+    return;
+  }
+
   /* If width of the strip too small ignore drawing thumbnails. */
   if ((y2 - y1) / pixely <= 20 * U.dpi_fac) {
     return;



More information about the Bf-blender-cvs mailing list