[Bf-blender-cvs] [c85d79cf51e] temp-vse-preview-transform2: Address inlines
Richard Antalik
noreply at git.blender.org
Fri Sep 17 10:06:15 CEST 2021
Commit: c85d79cf51eaf09042fc10925efa48ea17594dc0
Author: Richard Antalik
Date: Thu Sep 16 06:58:03 2021 +0200
Branches: temp-vse-preview-transform2
https://developer.blender.org/rBc85d79cf51eaf09042fc10925efa48ea17594dc0
Address inlines
===================================================================
M source/blender/blenloader/intern/versioning_300.c
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index 51037db2e0c..fec8f4489a6 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -1260,7 +1260,7 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
if (sl->spacetype == SPACE_SEQ) {
SpaceSeq *sseq = (SpaceSeq *)sl;
- sseq->flag |= SEQ_SHOW_IMAGE_OUTLINE;
+ sseq->flag |= SEQ_SHOW_OUTLINE_SELECTED;
}
}
}
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 53be07a2c30..e5d23272e43 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -158,7 +158,7 @@ static void blo_update_defaults_screen(bScreen *screen,
SpaceSeq *seq = area->spacedata.first;
seq->flag |= SEQ_SHOW_MARKERS | SEQ_SHOW_FCURVES | SEQ_ZOOM_TO_FIT | SEQ_SHOW_STRIP_OVERLAY |
SEQ_SHOW_STRIP_SOURCE | SEQ_SHOW_STRIP_NAME | SEQ_SHOW_STRIP_DURATION |
- SEQ_SHOW_GRID | SEQ_SHOW_IMAGE_OUTLINE;
+ SEQ_SHOW_GRID | SEQ_SHOW_OUTLINE_SELECTED;
seq->render_size = SEQ_RENDER_SIZE_PROXY_100;
seq->flag |= SEQ_USE_PROXIES;
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 208422fbd64..cebdcf00807 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -2057,7 +2057,8 @@ static void seq_draw_image_origin_and_outline(const bContext *C, Sequence *seq)
if (ED_screen_animation_no_scrub(CTX_wm_manager(C))) {
return;
}
- if ((sseq->flag & SEQ_SHOW_STRIP_OVERLAY) == 0 || (sseq->flag & SEQ_SHOW_IMAGE_OUTLINE) == 0) {
+ if ((sseq->flag & SEQ_SHOW_STRIP_OVERLAY) == 0 ||
+ (sseq->flag & SEQ_SHOW_OUTLINE_SELECTED) == 0) {
return;
}
@@ -2205,13 +2206,13 @@ void sequencer_draw_preview(const bContext *C,
sequencer_draw_maskedit(C, scene, region, sseq);
#endif
- UI_view2d_view_restore(C);
- seq_prefetch_wm_notify(C, scene);
-
/* Scope is freed in sequencer_check_scopes when `ibuf` changes and redraw is needed. */
if (ibuf) {
IMB_freeImBuf(ibuf);
}
+
+ UI_view2d_view_restore(C);
+ seq_prefetch_wm_notify(C, scene);
}
/* Draw backdrop in sequencer timeline. */
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c
index b101440091f..aa6599a7c53 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.c
+++ b/source/blender/editors/space_sequencer/sequencer_select.c
@@ -645,15 +645,14 @@ static Sequence *seq_select_seq_from_preview(const bContext *C, const int mval[2
SpaceSeq *sseq = CTX_wm_space_seq(C);
View2D *v2d = UI_view2d_fromcontext(C);
- float click_x, click_y;
- UI_view2d_region_to_view(v2d, mval[0], mval[1], &click_x, &click_y);
+ float mouseco_view[2];
+ UI_view2d_region_to_view(v2d, mval[0], mval[1], &mouseco_view[0], &mouseco_view[1]);
SeqCollection *strips = SEQ_query_rendered_strips(seqbase, scene->r.cfra, sseq->chanshown);
ListBase strips_ordered = {NULL};
Sequence *seq;
SEQ_ITERATOR_FOREACH (seq, strips) {
- float click_point[2] = {click_x, click_y};
- if (seq_point_image_isect(scene, seq, click_point)) {
+ if (seq_point_image_isect(scene, seq, mouseco_view)) {
BLI_remlink(seqbase, seq);
BLI_addtail(&strips_ordered, seq);
}
@@ -1371,15 +1370,10 @@ static bool seq_box_select_rect_image_isect(const Scene *scene, const Sequence *
{
float seq_image_quad[4][2];
SEQ_image_transform_final_quad_get(scene, seq, seq_image_quad);
- float rect_quad[4][2];
- rect_quad[0][0] = rect->xmax;
- rect_quad[0][1] = rect->ymax;
- rect_quad[1][0] = rect->xmax;
- rect_quad[1][1] = rect->ymin;
- rect_quad[2][0] = rect->xmin;
- rect_quad[2][1] = rect->ymin;
- rect_quad[3][0] = rect->xmin;
- rect_quad[3][1] = rect->ymax;
+ float rect_quad[4][2] = {{rect->xmax, rect->ymax},
+ {rect->xmax, rect->ymin},
+ {rect->xmin, rect->ymin},
+ {rect->xmin, rect->ymax}};
return seq_point_image_isect(scene, seq, rect_quad[0]) ||
seq_point_image_isect(scene, seq, rect_quad[1]) ||
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 62b0d32c36f..c680ff9355f 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -655,7 +655,7 @@ typedef enum eSpaceSeq_Flag {
SEQ_SHOW_STRIP_DURATION = (1 << 16),
SEQ_USE_PROXIES = (1 << 17),
SEQ_SHOW_GRID = (1 << 18),
- SEQ_SHOW_IMAGE_OUTLINE = (1 << 19),
+ SEQ_SHOW_OUTLINE_SELECTED = (1 << 19),
} eSpaceSeq_Flag;
/* SpaceSeq.view */
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 75c37c19219..818b2071662 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -5574,8 +5574,8 @@ static void rna_def_space_sequencer(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Show Grid", "Show vertical grid lines");
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_IMAGE_OUTLINE);
+ prop = RNA_def_property(srna, "show_outline_selected", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_SHOW_OUTLINE_SELECTED);
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