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

[Sebastian Koenig]

Commit: 39590dab00f4648aed28a0639a0d6c8e16c5d90f
Author: Sebastian Koenig
Date:   Tue Apr 12 12:40:13 2022 +0200
Branches: tracking_tools
https://developer.blender.org/rB39590dab00f4648aed28a0639a0d6c8e16c5d90f

Merge branch 'master' into tracking_tools

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



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

diff --cc source/blender/editors/mask/mask_ops.c
index d2384e1c358,3c0e7ee399c..7cc0a3e156e
--- a/source/blender/editors/mask/mask_ops.c
+++ b/source/blender/editors/mask/mask_ops.c
@@@ -242,11 -243,11 +243,11 @@@ static void mask_point_undistort_pos(Sp
    BKE_mask_coord_from_movieclip(sc->clip, &sc->user, r_co, r_co);
  }
  
 -static bool spline_under_mouse_get(const bContext *C,
 -                                   Mask *mask_orig,
 -                                   const float co[2],
 -                                   MaskLayer **r_mask_layer,
 -                                   MaskSpline **r_mask_spline)
 +bool ED_mask_spline_under_mouse_get(const bContext *C,
-                                     Mask *mask,
++                                    Mask *mask_orig,
 +                                    const float co[2],
 +                                    MaskLayer **r_mask_layer,
 +                                    MaskSpline **r_mask_spline)
  {
    const float threshold = 19.0f;
    ScrArea *area = CTX_wm_area(C);