[Bf-blender-cvs] [d5b8f977727] soc-2021-curves: Merge branch 'master' into soc-2021-curves

[Dilith Jayakody]

Commit: d5b8f977727a5164caebaf3cdde48d679892034c
Author: Dilith Jayakody
Date:   Wed Mar 16 12:18:28 2022 +0530
Branches: soc-2021-curves
https://developer.blender.org/rBd5b8f977727a5164caebaf3cdde48d679892034c

Merge branch 'master' into soc-2021-curves

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



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

diff --cc source/blender/editors/include/ED_curve.h
index 55934ca8cfb,6097e7c69d9..cd993c1c32e
--- a/source/blender/editors/include/ED_curve.h
+++ b/source/blender/editors/include/ED_curve.h
@@@ -47,13 -47,9 +47,13 @@@ void ED_curve_editnurb_load(struct Mai
  void ED_curve_editnurb_make(struct Object *obedit);
  void ED_curve_editnurb_free(struct Object *obedit);
  
+ /**
+  * \return True when pick finds an element or the selection changed.
+  */
 +bool ED_curve_editnurb_select_pick_thresholded(struct bContext *C,
 +                                               const int mval[2],
 +                                               const float sel_dist_mul,
 +                                               const struct SelectPick_Params *params);
- /**
-  * \return True when pick finds an element or the selection changed.
-  */
  bool ED_curve_editnurb_select_pick(struct bContext *C,
                                     const int mval[2],
                                     const struct SelectPick_Params *params);