[Bf-blender-cvs] [5efe36738f2] temp-vse-preview-transform2: Fix incorrect flag for `show_image_outline` property

Richard Antalik noreply at git.blender.org
Fri Sep 17 10:06:15 CEST 2021


Commit: 5efe36738f207225794b17445986dbb808fdac1e
Author: Richard Antalik
Date:   Thu Sep 16 04:31:39 2021 +0200
Branches: temp-vse-preview-transform2
https://developer.blender.org/rB5efe36738f207225794b17445986dbb808fdac1e

Fix incorrect flag for `show_image_outline` property

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

M	source/blender/editors/space_sequencer/sequencer_draw.c
M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 85c8a183aae..f3b6035100e 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -2190,6 +2190,16 @@ void sequencer_draw_preview(const bContext *C,
     sequencer_draw_borders_overlay(sseq, v2d, scene);
   }
 
+  SeqCollection *collection = SEQ_query_rendered_strips(&scene->ed->seqbase, timeline_frame, 0);
+  Sequence *seq;
+  SEQ_ITERATOR_FOREACH (seq, collection) {
+    seq_draw_image_origin_and_outline(C, seq);
+  }
+  SEQ_collection_free(collection);
+
+  UI_view2d_view_restore(C);
+  seq_prefetch_wm_notify(C, scene);
+
   if (draw_gpencil && show_imbuf && (sseq->flag & SEQ_SHOW_STRIP_OVERLAY)) {
     sequencer_draw_gpencil_overlay(C);
   }
@@ -2201,16 +2211,6 @@ void sequencer_draw_preview(const bContext *C,
   if (ibuf) {
     IMB_freeImBuf(ibuf);
   }
-
-  SeqCollection *collection = SEQ_query_rendered_strips(&scene->ed->seqbase, timeline_frame, 0);
-  Sequence *seq;
-  SEQ_ITERATOR_FOREACH (seq, collection) {
-    seq_draw_image_origin_and_outline(C, seq);
-  }
-  SEQ_collection_free(collection);
-
-  UI_view2d_view_restore(C);
-  seq_prefetch_wm_notify(C, scene);
 }
 
 /* Draw backdrop in sequencer timeline. */
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 4c61785a299..75c37c19219 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -5575,7 +5575,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna)
   RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL);
 
   prop = RNA_def_property(srna, "show_image_outline", PROP_BOOLEAN, PROP_NONE);
-  RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_SHOW_GRID);
+  RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_SHOW_IMAGE_OUTLINE);
   RNA_def_property_ui_text(prop, "Image Outline", "");
   RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL);
 }



More information about the Bf-blender-cvs mailing list