blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Merge branch 'blender-v3.2-release'

This commit is contained in:
Campbell Barton 2022-05-04 19:32:09 +10:00
parent 5f8f436dca 0375720e28
commit e7ba34599c
1 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
source/blender/editors/space_view3d/view3d_select.c
View File

@ -4603,6 +4603,48 @@ static bool object_circle_select(ViewContext *vc,
}
/* not a real operator, only for circle test */
static void view3d_circle_select_recalc(void *user_data)
{
bContext *C = user_data;
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
ViewContext vc;
ED_view3d_viewcontext_init(C, &vc, depsgraph);
em_setup_viewcontext(C, &vc);
if (vc.obedit) {
switch (vc.obedit->type) {
case OB_MESH: {
FOREACH_OBJECT_IN_MODE_BEGIN (
vc.view_layer, vc.v3d, vc.obact->type, vc.obact->mode, ob_iter) {
ED_view3d_viewcontext_init_object(&vc, ob_iter);
BM_mesh_select_mode_flush_ex(
vc.em->bm, vc.em->selectmode, BM_SELECT_LEN_FLUSH_RECALC_ALL);
}
FOREACH_OBJECT_IN_MODE_END;
break;
}
default:
break;
}
}
}
static int view3d_circle_select_modal(bContext *C, wmOperator *op, const wmEvent *event)
{
int result = WM_gesture_circle_modal(C, op, event);
if (result & OPERATOR_FINISHED) {
view3d_circle_select_recalc(C);
}
return result;
}
static void view3d_circle_select_cancel(bContext *C, wmOperator *op)
{
WM_gesture_circle_cancel(C, op);
view3d_circle_select_recalc(C);
}
static int view3d_circle_select_exec(bContext *C, wmOperator *op)
{
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
@ -4694,10 +4736,10 @@ void VIEW3D_OT_select_circle(wmOperatorType *ot)
ot->idname = "VIEW3D_OT_select_circle";
ot->invoke = WM_gesture_circle_invoke;
ot->modal = WM_gesture_circle_modal;
ot->modal = view3d_circle_select_modal;
ot->exec = view3d_circle_select_exec;
ot->poll = view3d_selectable_data;
ot->cancel = WM_gesture_circle_cancel;
ot->cancel = view3d_circle_select_cancel;
/* flags */
ot->flag = OPTYPE_UNDO;