[Bf-blender-cvs] [4ab8212e1a0] master: Fix errors in 68dc970219ef7a559b48bd1b3e45d033367b4172

Campbell Barton noreply at git.blender.org
Wed Oct 6 12:42:23 CEST 2021


Commit: 4ab8212e1a0fbeff0ab7e33a37b6f2f97182566b
Author: Campbell Barton
Date:   Wed Oct 6 21:38:42 2021 +1100
Branches: master
https://developer.blender.org/rB4ab8212e1a0fbeff0ab7e33a37b6f2f97182566b

Fix errors in 68dc970219ef7a559b48bd1b3e45d033367b4172

Swapped preview/timeline keymap and incorrect center measurement.

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

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	source/blender/editors/space_sequencer/sequencer_select.c

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

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 1ab0e25b59d..b8b27b0e8ba 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -4647,7 +4647,7 @@ def _template_sequencer_generic_select(*, type, value, legacy):
     )]
 
 
-def _template_sequencer_timeline_select(*, type, value, legacy):
+def _template_sequencer_preview_select(*, type, value, legacy):
     return _template_sequencer_generic_select(
         type=type, value=value, legacy=legacy,
     ) + [(
@@ -4665,7 +4665,7 @@ def _template_sequencer_timeline_select(*, type, value, legacy):
     )]
 
 
-def _template_sequencer_preview_select(*, type, value, legacy):
+def _template_sequencer_timeline_select(*, type, value, legacy):
     return _template_sequencer_generic_select(
         type=type, value=value, legacy=legacy,
     ) + [(
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c
index 5b5b5e002f6..7722909190f 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.c
+++ b/source/blender/editors/space_sequencer/sequencer_select.c
@@ -671,8 +671,7 @@ static Sequence *seq_select_seq_from_preview(const bContext *C,
     SEQ_ITERATOR_FOREACH (seq, strips) {
       float co[2];
       SEQ_image_transform_origin_offset_pixelspace_get(scene, seq, co);
-      sub_v2_v2(co, mouseco_view);
-      const float center_dist_sq_test = len_squared_v2(co);
+      const float center_dist_sq_test = len_squared_v2v2(co, mouseco_view);
       if ((seq_best == NULL) || (center_dist_sq_test < center_dist_sq_best)) {
         seq_best = seq;
         center_dist_sq_best = center_dist_sq_test;



More information about the Bf-blender-cvs mailing list