[Bf-blender-cvs] [ee954ed1d17] tracking_tools: Merge branch 'master' into tracking_tools

[Sergey Sharybin]

Commit: ee954ed1d172c1bbd71ac696a7b6ac56542581e2
Author: Sergey Sharybin
Date:   Mon May 16 15:00:53 2022 +0200
Branches: tracking_tools
https://developer.blender.org/rBee954ed1d172c1bbd71ac696a7b6ac56542581e2

Merge branch 'master' into tracking_tools

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



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

diff --cc source/blender/editors/space_clip/tracking_select.c
index 73765a70670,be6f4558066..b6d458a7780
--- a/source/blender/editors/space_clip/tracking_select.c
+++ b/source/blender/editors/space_clip/tracking_select.c
@@@ -301,18 -301,16 +301,18 @@@ static int select_exec(bContext *C, wmO
    /* Special code which allows to slide a marker which belongs to currently selected but not yet
     * active track. If such track is found activate it and return pass-though so that marker slide
     * operator can be used immediately after.
 -   * This logic makes it convenient to slide markers when left mouse selection is used. */
 -  if (!extend) {
 +   * This logic makes it convenient to slide markers when left mouse selection is used. Without it
 +   * selection will be lost which causes inconvenience for the VFX artist. */
 +  const bool activate_selected = RNA_boolean_get(op->ptr, "activate_selected");
 +  if (activate_selected) {
      MovieTrackingTrack *track = tracking_find_slidable_track_in_proximity(C, co);
      if (track != NULL) {
-       MovieClip *clip = ED_space_clip_get_clip(sc);
+       MovieClip *clip_iter = ED_space_clip_get_clip(sc);
  
-       clip->tracking.act_track = track;
+       clip_iter->tracking.act_track = track;
  
        WM_event_add_notifier(C, NC_GEOM | ND_SELECT, NULL);
-       DEG_id_tag_update(&clip->id, ID_RECALC_SELECT);
+       DEG_id_tag_update(&clip_iter->id, ID_RECALC_SELECT);
  
        return OPERATOR_PASS_THROUGH;
      }