Commit: 6479e800bc21e06c5afe002f5b9f4efb80e6db53
Author: Dalai Felinto
Date: Fri Oct 26 19:54:11 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB6479e800bc21e06c5afe002f5b9f4efb80e6db53
Multi-Objects: Curve - select pick, linked and short path
I'm following mesh editing to decide when to switch active object, or
deselect the other objects. I hope we can keep this all consistent in
the end.
===================================================================
M source/blender/editors/curve/curve_intern.h
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editcurve_select.c
===================================================================
diff --git a/source/blender/editors/curve/curve_intern.h
b/source/blender/editors/curve/curve_intern.h
index 232c818d054..cd7a344fcb0 100644
--- a/source/blender/editors/curve/curve_intern.h
+++ b/source/blender/editors/curve/curve_intern.h
@@ -135,8 +135,9 @@ struct GHash *ED_curve_keyindex_hash_duplicate(struct GHash
*keyindex);
void ED_curve_keyindex_update_nurb(struct EditNurb *editnurb, struct
Nurb *nu, struct Nurb *newnu);
bool ED_curve_pick_vert(
- struct ViewContext *vc, short sel, const int mval[2],
- struct Nurb **r_nurb, struct BezTriple **r_bezt, struct BPoint **r_bp,
short *r_handle);
+ struct ViewContext *vc, short sel,
+ struct Nurb **r_nurb, struct BezTriple **r_bezt, struct BPoint **r_bp,
short *r_handle,
+ struct Base **r_base);
/* helper functions */
void ed_editnurb_translate_flag(struct ListBase *editnurb, short flag, const
float vec[3]);
diff --git a/source/blender/editors/curve/editcurve.c
b/source/blender/editors/curve/editcurve.c
index cdd59203cd6..a0377038735 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -3437,7 +3437,7 @@ void CURVE_OT_subdivide(wmOperatorType *ot)
static void ED_curve_pick_vert__doClosest(void *userData, Nurb *nu, BPoint
*bp, BezTriple *bezt, int beztindex, const float screen_co[2])
{
- struct { BPoint *bp; BezTriple *bezt; Nurb *nurb; float dist; int
hpoint, select; float mval_fl[2]; } *data = userData;
+ struct { BPoint *bp; BezTriple *bezt; Nurb *nurb; float dist; int
hpoint, select; float mval_fl[2]; bool is_changed; } *data = userData;
short flag;
float dist_test;
@@ -3468,26 +3468,41 @@ static void ED_curve_pick_vert__doClosest(void
*userData, Nurb *nu, BPoint *bp,
data->bezt = bezt;
data->nurb = nu;
data->hpoint = bezt ? beztindex : 0;
+ data->is_changed = true;
}
}
bool ED_curve_pick_vert(
- ViewContext *vc, short sel, const int mval[2],
- Nurb **r_nurb, BezTriple **r_bezt, BPoint **r_bp, short *r_handle)
+ ViewContext *vc, short sel,
+ Nurb **r_nurb, BezTriple **r_bezt, BPoint **r_bp, short *r_handle,
+ Base **r_base)
{
/* (sel == 1): selected gets a disadvantage */
/* in nurb and bezt or bp the nearest is written */
/* return 0 1 2: handlepunt */
- struct { BPoint *bp; BezTriple *bezt; Nurb *nurb; float dist; int
hpoint, select; float mval_fl[2]; } data = {NULL};
+ struct { BPoint *bp; BezTriple *bezt; Nurb *nurb; float dist; int
hpoint, select; float mval_fl[2]; bool is_changed; } data = {NULL};
data.dist = ED_view3d_select_dist_px();
data.hpoint = 0;
data.select = sel;
- data.mval_fl[0] = mval[0];
- data.mval_fl[1] = mval[1];
+ data.mval_fl[0] = vc->mval[0];
+ data.mval_fl[1] = vc->mval[1];
- ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d);
- nurbs_foreachScreenVert(vc, ED_curve_pick_vert__doClosest, &data,
V3D_PROJ_TEST_CLIP_DEFAULT);
+ uint bases_len;
+ Base **bases =
BKE_view_layer_array_from_bases_in_edit_mode_unique_data(vc->view_layer,
&bases_len);
+ for (uint base_index = 0; base_index < bases_len; base_index++) {
+ Base *base = bases[base_index];
+ data.is_changed = false;
+
+ ED_view3d_viewcontext_init_object(vc, base->object);
+ ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d);
+ nurbs_foreachScreenVert(vc, ED_curve_pick_vert__doClosest,
&data, V3D_PROJ_TEST_CLIP_DEFAULT);
+
+ if (r_base && data.is_changed) {
+ *r_base = base;
+ }
+ }
+ MEM_freeN(bases);
*r_nurb = data.nurb;
*r_bezt = data.bezt;
@@ -4323,24 +4338,37 @@ void CURVE_OT_make_segment(wmOperatorType *ot)
bool ED_curve_editnurb_select_pick(bContext *C, const int mval[2], bool
extend, bool deselect, bool toggle)
{
- Object *obedit = CTX_data_edit_object(C);
- Curve *cu = obedit->data;
- ListBase *editnurb = object_editcurve_get(obedit);
ViewContext vc;
Nurb *nu;
BezTriple *bezt = NULL;
BPoint *bp = NULL;
- const void *vert = BKE_curve_vert_active_get(cu);
- int location[2];
+ Base *basact = NULL;
short hand;
view3d_operator_needs_opengl(C);
ED_view3d_viewcontext_init(C, &vc);
+ copy_v2_v2_int(vc.mval, mval);
+
+ if (ED_curve_pick_vert(&vc, 1, &nu, &bezt, &bp, &hand, &basact)) {
+ Object *obedit = basact->object;
+ Curve *cu = obedit->data;
+ ListBase *editnurb = object_editcurve_get(obedit);
+ const void *vert = BKE_curve_vert_active_get(cu);
+
+ if (!extend && !deselect && !toggle) {
+ uint objects_len = 0;
+ Object **objects =
BKE_view_layer_array_from_objects_in_edit_mode_unique_data(vc.view_layer,
&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);
- location[0] = mval[0];
- location[1] = mval[1];
+ DEG_id_tag_update(ob_iter->data,
DEG_TAG_SELECT_UPDATE);
+ WM_event_add_notifier(C, NC_GEOM | ND_SELECT,
ob_iter->data);
+ }
+ MEM_freeN(objects);
+ }
- if (ED_curve_pick_vert(&vc, 1, location, &nu, &bezt, &bp, &hand)) {
if (extend) {
if (bezt) {
if (hand == 1) {
@@ -4430,6 +4458,10 @@ bool ED_curve_editnurb_select_pick(bContext *C, const
int mval[2], bool extend,
BKE_curve_nurb_active_set(cu, nu);
}
+ if (vc.view_layer->basact != basact) {
+ ED_object_base_activate(C, basact);
+ }
+
DEG_id_tag_update(obedit->data, DEG_TAG_SELECT_UPDATE);
WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
diff --git a/source/blender/editors/curve/editcurve_select.c
b/source/blender/editors/curve/editcurve_select.c
index d7ceb86c373..1a4785f16f7 100644
--- a/source/blender/editors/curve/editcurve_select.c
+++ b/source/blender/editors/curve/editcurve_select.c
@@ -48,6 +48,7 @@
#include "WM_api.h"
#include "WM_types.h"
+#include "ED_object.h"
#include "ED_screen.h"
#include "ED_select_utils.h"
#include "ED_types.h"
@@ -583,18 +584,19 @@ void CURVE_OT_select_linked(wmOperatorType *ot)
static int select_linked_pick_invoke(bContext *C, wmOperator *op, const
wmEvent *event)
{
- Object *obedit = CTX_data_edit_object(C);
ViewContext vc;
Nurb *nu;
BezTriple *bezt;
BPoint *bp;
int a;
const bool select = !RNA_boolean_get(op->ptr, "deselect");
+ Base *basact = NULL;
view3d_operator_needs_opengl(C);
ED_view3d_viewcontext_init(C, &vc);
+ copy_v2_v2_int(vc.mval, event->mval);
- if (!ED_curve_pick_vert(&vc, 1, event->mval, &nu, &bezt, &bp, NULL)) {
+ if (!ED_curve_pick_vert(&vc, 1, &nu, &bezt, &bp, NULL, &basact)) {
return OPERATOR_CANCELLED;
}
@@ -615,8 +617,11 @@ static int select_linked_pick_invoke(bContext *C,
wmOperator *op, const wmEvent
}
}
+ Object *obedit = basact->object;
+
DEG_id_tag_update(obedit->data, DEG_TAG_SELECT_UPDATE);
WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+
if (!select) {
BKE_curve_nurb_vert_active_validate(obedit->data);
}
@@ -1717,26 +1722,29 @@ static void curve_select_shortest_path_surf(Nurb *nu,
int vert_src, int vert_dst
static int edcu_shortest_path_pick_invoke(bContext *C, wmOperator *op, const
wmEvent *event)
{
- Object *obedit = CTX_data_edit_object(C);
- Curve *cu = obedit->data;
- Nurb *nu_src = BKE_curve_nurb_active_get(cu);
- int vert_src = cu->actvert;
-
ViewContext vc;
Nurb *nu_dst;
BezTriple *bezt_dst;
BPoint *bp_dst;
int vert_dst;
void *vert_dst_p;
+ Base *basact = NULL;
- if (vert_src == CU_ACT_NONE) {
+ view3d_operator_needs_opengl(C);
+ ED_view3d_viewcontext_init(C, &vc);
+ copy_v2_v2_int(vc.mval, event->mval);
+
+ if (!ED_curve_pick_vert(&vc, 1, &nu_dst, &bezt_dst, &bp_dst, NULL,
&basact)) {
return OPERATOR_PASS_THROUGH;
}
- view3d_operator_needs_opengl(C);
- ED_view3d_viewcontext_init(C, &vc);
+ ED_view3d_viewcontext_init_object(&vc, basact->object);
+ Object *obedit = basact->object;
+ Curve *cu = obedit->data;
+ Nurb *nu_src = BKE_curve_nurb_active_get(cu);
+ int vert_src = cu->actvert;
- if (!ED_curve_pick_vert(&vc, 1, event->mval, &nu_dst, &bezt_dst,
&bp_dst, NULL)) {
+ if (vert_src == CU_ACT_NONE) {
return OPERATOR_PASS_THROUGH;
}
@@ -1760,6 +1768,10 @@ static int edcu_shortest_path_pick_invoke(bContext *C,
wmOperator *op, const wmE
BKE_curve_nurb_vert_active_set(cu, nu_dst, vert_dst_p);
+ if (vc.view_layer->basact != basact) {
+ ED_object_base_activate(C, basact);
+ }
+
DEG_id_tag_update(obedit->data, DEG_TAG_SELECT_UPDATE);
WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
return OPERATOR_FINISHED;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
