blender
/
blender
134
424
Fork 606
Code Issues 6.4k Pull Requests 773 Projects 19 Wiki Activity

WIP: GPv3: Select Circle operator #108815

Closed
Gangneron wants to merge 14 commits from (deleted):gpv3-select-circle into main
pull from: (deleted):gpv3-select-circle
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 8 Commits 14 Files Changed 2 +57
1 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eae7599128 - Show all commits

57
source/blender/editors/space_view3d/view3d_select.cc
View File

@ -53,6 +53,7 @@
#include "BKE_crazyspace.hh"
#include "BKE_curve.h"
#include "BKE_editmesh.h"
#include "BKE_grease_pencil.hh"
#include "BKE_layer.h"
#include "BKE_mball.h"
#include "BKE_mesh.hh"
@ -4028,6 +4029,32 @@ static bool do_pose_box_select(bContext *C,
return changed_multi;
}
Falk David commented 2023-06-12 16:57:20 +02:00
Outdated
Review
Copy Link

This looks like some copy-paste error, these added lines should be removed.

This looks like some copy-paste error, these added lines should be removed.
static bool do_grease_pencil_box_select(ViewContext *vc, const rcti *rect, const eSelectOp sel_op)
Falk David commented 2023-06-11 16:53:39 +02:00
Outdated
Review
Copy Link

This function should be removed. It looks like you might also need to merge with main.

This function should be removed. It looks like you might also need to merge with `main`.
{
using namespace blender;
Scene *scene = vc->scene;
const Object *ob_eval = DEG_get_evaluated_object(vc->depsgraph,
const_cast<Object *>(vc->obedit));
GreasePencil &grease_pencil = *static_cast<GreasePencil *>(vc->obedit->data);
bool changed = false;
grease_pencil.foreach_editable_drawing(
scene->r.cfra, [&](int drawing_index, GreasePencilDrawing &drawing) {
bke::crazyspace::GeometryDeformation deformation =
bke::crazyspace::get_evaluated_grease_pencil_drawing_deformation(
ob_eval, *vc->obedit, drawing_index);
changed |= ed::curves::select_box(
*vc, drawing.geometry.wrap(), deformation.positions, ATTR_DOMAIN_POINT, *rect, sel_op);
});
if (changed) {
DEG_id_tag_update(&grease_pencil.id, ID_RECALC_GEOMETRY);
WM_event_add_notifier(vc->C, NC_GEOM | ND_DATA, &grease_pencil);
}
return changed;
}
static int view3d_box_select_exec(bContext *C, wmOperator *op)
{
using namespace blender;
@ -4113,6 +4140,10 @@ static int view3d_box_select_exec(bContext *C, wmOperator *op)
}
break;
}
case OB_GREASE_PENCIL: {
Falk David commented 2023-06-11 16:53:52 +02:00
Outdated
Review
Copy Link

Same comment as above.

Same comment as above.
changed = do_grease_pencil_box_select(&vc, &rect, sel_op);
break;
}
default:
BLI_assert_msg(0, "box select on incorrect object type");
break;
@ -4836,7 +4867,30 @@ static bool mball_circle_select(ViewContext *vc,
vc, do_circle_select_mball__doSelectElem, &data, V3D_PROJ_TEST_CLIP_DEFAULT);
return data.is_changed;
}
/**
* Callbacks for select circle in greasce pensil mode
*/
static bool grease_pensil_circle_select(ViewContext *vc,
Falk David commented 2023-06-11 16:57:51 +02:00
Outdated
Review
Copy Link

This function doesn't look right. First, it should be named grease_pencil_circle_select.
Second, the logic in the function is not right, it should be similar to the logic inside do_grease_pencil_box_select.

This function doesn't look right. First, it should be named `grease_pencil_circle_select`. Second, the logic in the function is not right, it should be similar to the logic inside `do_grease_pencil_box_select`.
const eSelectOp sel_op
const int mval[2],
float rad)
{
BLI_assert(ELEM(sel_op, SEL_OP_SET, SEL_OP_ADD, SEL_OP_SUB));
Scene *scene = vc->scene;
ViewLayer *view_layer = vc->view_layer;
View3D *v3d = vc->v3d;
const float radius_squared = rad * rad;
const float mval_fl[2] = {float(mval[0]), float(mval[1])};
bool changed = false;
if (SEL_OP_USE_PRE_SELECT(sel_op)) {
changed |= grease_pensil_circle_select(scene->vc, view_layer->vc, vcv3d->vc);
}
return changed;
}
/**
* Callbacks for circle selection in Editmode
*/
@ -4870,6 +4924,9 @@ static bool obedit_circle_select(bContext *C,
case OB_MBALL:
changed = mball_circle_select(vc, sel_op, mval, rad);
break;
ase OB_GREASE_PENSIL:
Falk David commented 2023-06-11 16:59:14 +02:00
Outdated
Review
Copy Link

OB_GREASE_PENSIL -> OB_GREASE_PENCIL

`OB_GREASE_PENSIL` -> `OB_GREASE_PENCIL`
changed = grease_pensil_circle_select(vc, sel_op, mval, rad);
Falk David commented 2023-06-11 16:58:53 +02:00
Outdated
Review
Copy Link

There should just be a call to grease_pencil_circle_select here.

There should just be a call to `grease_pencil_circle_select` here.
break;
case OB_CURVES: {
Curves &curves_id = *static_cast<Curves *>(vc->obedit->data);
bke::CurvesGeometry &curves = curves_id.geometry.wrap();