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

[Dilith Jayakody]

Commit: 255e1da82db9e0a2f40146c5e176964761314fa8
Author: Dilith Jayakody
Date:   Thu Mar 17 09:41:09 2022 +0530
Branches: soc-2021-curves
https://developer.blender.org/rB255e1da82db9e0a2f40146c5e176964761314fa8

Merge branch 'master' into soc-2021-curves

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



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

diff --cc source/blender/editors/curve/editcurve.c
index 30d536eca90,5ff63e767f6..f9ded62ea64
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@@ -4748,24 -4740,29 +4748,30 @@@ bool ED_curve_editnurb_select_pick_thre
    ED_view3d_viewcontext_init(C, &vc, depsgraph);
    copy_v2_v2_int(vc.mval, mval);
  
-   const bool found = ED_curve_pick_vert_thresholded(
 -  bool found = ED_curve_pick_vert(&vc, 1, &nu, &bezt, &bp, &hand, &basact);
++  bool found = ED_curve_pick_vert_thresholded(
 +      &vc, 1, sel_dist_mul, &nu, &bezt, &bp, &hand, &basact);
  
-   if ((params->sel_op == SEL_OP_SET) && (found || params->deselect_all)) {
-     /* Deselect everything. */
-     uint objects_len = 0;
-     Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(
-         vc.view_layer, vc.v3d, &objects_len);
-     for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
-       Object *ob_iter = objects[ob_index];
+   if (params->sel_op == SEL_OP_SET) {
+     if ((found && params->select_passthrough) &&
+         (((bezt ? (&bezt->f1)[hand] : bp->f1) & SELECT) != 0)) {
+       found = false;
+     }
+     else if (found || params->deselect_all) {
+       /* Deselect everything. */
+       uint objects_len = 0;
+       Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(
+           vc.view_layer, vc.v3d, &objects_len);
+       for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+         Object *ob_iter = objects[ob_index];
  
-       ED_curve_deselect_all(((Curve *)ob_iter->data)->editnurb);
+         ED_curve_deselect_all(((Curve *)ob_iter->data)->editnurb);
  
-       DEG_id_tag_update(ob_iter->data, ID_RECALC_SELECT | ID_RECALC_COPY_ON_WRITE);
-       WM_event_add_notifier(C, NC_GEOM | ND_SELECT, ob_iter->data);
+         DEG_id_tag_update(ob_iter->data, ID_RECALC_SELECT | ID_RECALC_COPY_ON_WRITE);
+         WM_event_add_notifier(C, NC_GEOM | ND_SELECT, ob_iter->data);
+       }
+       MEM_freeN(objects);
+       changed = true;
      }
-     MEM_freeN(objects);
-     changed = true;
    }
  
    if (found) {