blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

UV: support "Tweak Tool: Left Mouse Select & Move" 

- Follow the same conventions as the 3D viewport for UV selection
  (using SelectPick_Params internally).

- Use WM_operator_properties_mouse_select for selection properties.
This commit is contained in:
Campbell Barton 2022-03-18 00:28:15 +11:00
parent cf1a0ca612
commit d356edf420
Notes: blender-bot 2023-05-31 04:43:10 +02:00 
Referenced by commit c4701a027f, Fix T98558: island selection in UV editor can crash
Referenced by issue #98558, Regression: Crash when using island selection in UV editor
Referenced by issue #96544, Tweak tool consistency & behavior
Referenced by issue #86382, uv.select operator is hardcoded to cycle
3 changed files with 136 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -4716,7 +4716,7 @@ def _template_uv_select(*, type, value, legacy):
("uv.select", {"type": type, "value": value},
{"properties": [("deselect_all", not legacy)]}),
("uv.select", {"type": type, "value": value, "shift": True},
{"properties": [("extend", True)]}),
{"properties": [("toggle", True)]}),
]
@ -6306,7 +6306,7 @@ def km_image_editor_tool_uv_select(params, *, fallback):
{"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
{"items": [
*([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else _template_items_tool_select(
params, "uv.select", "uv.cursor_set", fallback, extend="extend")),
params, "uv.select", "uv.cursor_set", fallback, extend="toggle")),
*([] if (not params.use_fallback_tool_rmb) else _template_uv_select(
type=params.select_mouse, value=params.select_mouse_value, legacy=params.legacy)),
]},

4
release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
View File

@ -564,9 +564,9 @@ def km_uv_editor(params):
{"properties": [("type", 'ISLAND')]}),
("uv.select", {"type": 'LEFTMOUSE', "value": 'CLICK'},
{"properties": [("extend", False), ("deselect_all", True)]}),
{"properties": [("deselect_all", True)]}),
("uv.select", {"type": 'LEFTMOUSE', "value": 'CLICK', "shift": True},
{"properties": [("extend", True), ("deselect_all", False)]}),
{"properties": [("toggle", True), ("deselect_all", False)]}),
("transform.translate", {"type": 'LEFTMOUSE', "value": 'CLICK_DRAG'}, None),
("uv.select_loop", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK', "shift": True},

237
source/blender/editors/uvedit/uvedit_select.c
View File

@ -2388,12 +2388,11 @@ void UV_OT_select_all(wmOperatorType *ot)
/** \name Mouse Select Operator
* \{ */
static int uv_mouse_select_multi(bContext *C,
Object **objects,
uint objects_len,
const float co[2],
const bool extend,
const bool deselect_all)
static bool uv_mouse_select_multi(bContext *C,
Object **objects,
uint objects_len,
const float co[2],
const struct SelectPick_Params *params)
{
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
const ARegion *region = CTX_wm_region(C);
@ -2477,117 +2476,145 @@ static int uv_mouse_select_multi(bContext *C,
}
}
if (!found_item) {
if (deselect_all) {
uv_select_all_perform_multi(scene, objects, objects_len, SEL_DESELECT);
bool found = found_item;
bool changed = false;
bool is_selected = false;
if (found) {
Object *obedit = hit.ob;
BMEditMesh *em = BKE_editmesh_from_object(obedit);
const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
if (selectmode == UV_SELECT_FACE) {
is_selected = uvedit_face_select_test(scene, hit.efa, cd_loop_uv_offset);
}
else if (selectmode == UV_SELECT_EDGE) {
is_selected = uvedit_edge_select_test(scene, hit.l, cd_loop_uv_offset);
}
else { /* Vertex or island. */
is_selected = uvedit_uv_select_test(scene, hit.l, cd_loop_uv_offset);
}
}
if (params->sel_op == SEL_OP_SET) {
if ((found && params->select_passthrough) && is_selected) {
found = false;
}
else if (found || params->deselect_all) {
/* Deselect everything. */
uv_select_all_perform_multi(scene, objects, objects_len, SEL_DESELECT);
for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
Object *obedit = objects[ob_index];
uv_select_tag_update_for_object(depsgraph, ts, obedit);
}
return OPERATOR_PASS_THROUGH | OPERATOR_FINISHED;
changed = true;
}
return OPERATOR_CANCELLED;
}
Object *obedit = hit.ob;
BMEditMesh *em = BKE_editmesh_from_object(obedit);
const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
if (found) {
Object *obedit = hit.ob;
BMEditMesh *em = BKE_editmesh_from_object(obedit);
const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
/* do selection */
if (selectmode == UV_SELECT_ISLAND) {
if (!extend) {
uv_select_all_perform_multi_ex(scene, objects, objects_len, SEL_DESELECT, obedit);
if (selectmode == UV_SELECT_ISLAND) {
const bool extend = params->sel_op == SEL_OP_ADD;
const bool deselect = params->sel_op == SEL_OP_SUB;
const bool toggle = params->sel_op == SEL_OP_XOR;
/* Current behavior of 'extend'
* is actually toggling, so pass extend flag as 'toggle' here */
uv_select_linked_multi(scene, objects, objects_len, &hit, extend, deselect, toggle, false);
/* TODO: check if this actually changed. */
changed = true;
}
/* Current behavior of 'extend'
* is actually toggling, so pass extend flag as 'toggle' here */
uv_select_linked_multi(scene, objects, objects_len, &hit, false, false, extend, false);
}
else if (extend) {
bool select = true;
if (selectmode == UV_SELECT_VERTEX) {
/* (de)select uv vertex */
select = !uvedit_uv_select_test(scene, hit.l, cd_loop_uv_offset);
uvedit_uv_select_set_with_sticky(scene, em, hit.l, select, true, cd_loop_uv_offset);
flush = 1;
}
else if (selectmode == UV_SELECT_EDGE) {
/* (de)select edge */
select = !(uvedit_edge_select_test(scene, hit.l, cd_loop_uv_offset));
uvedit_edge_select_set_with_sticky(scene, em, hit.l, select, true, cd_loop_uv_offset);
flush = 1;
}
else if (selectmode == UV_SELECT_FACE) {
/* (de)select face */
select = !(uvedit_face_select_test(scene, hit.efa, cd_loop_uv_offset));
uvedit_face_select_set_with_sticky(scene, em, hit.efa, select, true, cd_loop_uv_offset);
flush = -1;
else {
BLI_assert(ELEM(selectmode, UV_SELECT_VERTEX, UV_SELECT_EDGE, UV_SELECT_FACE));
bool select_value = false;
switch (params->sel_op) {
case SEL_OP_ADD: {
select_value = true;
break;
}
case SEL_OP_SUB: {
select_value = false;
break;
}
case SEL_OP_XOR: {
select_value = !is_selected;
break;
}
case SEL_OP_SET: {
/* Deselect has already been performed. */
select_value = true;
break;
}
case SEL_OP_AND: {
BLI_assert_unreachable(); /* Doesn't make sense for picking. */
break;
}
}
if (selectmode == UV_SELECT_FACE) {
uvedit_face_select_set_with_sticky(
scene, em, hit.efa, select_value, true, cd_loop_uv_offset);
flush = 1;
}
else if (selectmode == UV_SELECT_EDGE) {
uvedit_edge_select_set_with_sticky(
scene, em, hit.l, select_value, true, cd_loop_uv_offset);
flush = 1;
}
else if (selectmode == UV_SELECT_VERTEX) {
uvedit_uv_select_set_with_sticky(scene, em, hit.l, select_value, true, cd_loop_uv_offset);
flush = 1;
}
else {
BLI_assert_unreachable();
}
/* De-selecting an edge may deselect a face too - validate. */
if (ts->uv_flag & UV_SYNC_SELECTION) {
if (select_value == false) {
BM_select_history_validate(em->bm);
}
}
/* (de)select sticky UV nodes. */
if (sticky != SI_STICKY_DISABLE) {
flush = select_value ? 1 : -1;
}
changed = true;
}
/* de-selecting an edge may deselect a face too - validate */
if (ts->uv_flag & UV_SYNC_SELECTION) {
if (select == false) {
BM_select_history_validate(em->bm);
if (flush != 0) {
EDBM_selectmode_flush(em);
}
}
/* (de)select sticky uv nodes */
if (sticky != SI_STICKY_DISABLE) {
flush = select ? 1 : -1;
}
}
else {
const bool select = true;
/* deselect all */
uv_select_all_perform_multi(scene, objects, objects_len, SEL_DESELECT);
if (selectmode == UV_SELECT_VERTEX) {
/* select vertex */
uvedit_uv_select_set_with_sticky(scene, em, hit.l, select, true, cd_loop_uv_offset);
flush = 1;
}
else if (selectmode == UV_SELECT_EDGE) {
/* select edge */
uvedit_edge_select_set_with_sticky(scene, em, hit.l, select, true, cd_loop_uv_offset);
flush = 1;
}
else if (selectmode == UV_SELECT_FACE) {
/* select face */
uvedit_face_select_set_with_sticky(scene, em, hit.efa, select, true, cd_loop_uv_offset);
flush = 1;
else {
/* Setting the selection implies a single element, which doesn't need to be flushed. */
if (params->sel_op != SEL_OP_SET) {
ED_uvedit_selectmode_flush(scene, em);
}
}
}
if (ts->uv_flag & UV_SYNC_SELECTION) {
if (flush != 0) {
EDBM_selectmode_flush(em);
}
}
/* #extend=false implies single vertex selection, which doesn't need to be flushed. */
else if (extend) {
ED_uvedit_selectmode_flush(scene, em);
if (changed && found) {
/* Only update the `hit` object as de-selecting all will have refreshed the others. */
Object *obedit = hit.ob;
uv_select_tag_update_for_object(depsgraph, ts, obedit);
}
for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
Object *obiter = objects[ob_index];
uv_select_tag_update_for_object(depsgraph, ts, obiter);
}
return OPERATOR_PASS_THROUGH | OPERATOR_FINISHED;
return changed || found;
}
static int uv_mouse_select(bContext *C,
const float co[2],
const bool extend,
const bool deselect_all)
static bool uv_mouse_select(bContext *C, const float co[2], const struct SelectPick_Params *params)
{
ViewLayer *view_layer = CTX_data_view_layer(C);
uint objects_len = 0;
Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(
view_layer, ((View3D *)NULL), &objects_len);
int ret = uv_mouse_select_multi(C, objects, objects_len, co, extend, deselect_all);
bool changed = uv_mouse_select_multi(C, objects, objects_len, co, params);
MEM_freeN(objects);
return ret;
return changed;
}
static int uv_select_exec(bContext *C, wmOperator *op)
@ -2595,10 +2622,20 @@ static int uv_select_exec(bContext *C, wmOperator *op)
float co[2];
RNA_float_get_array(op->ptr, "location", co);
const bool extend = RNA_boolean_get(op->ptr, "extend");
const bool deselect_all = RNA_boolean_get(op->ptr, "deselect_all");
const struct SelectPick_Params params = {
.sel_op = ED_select_op_from_booleans(RNA_boolean_get(op->ptr, "extend"),
RNA_boolean_get(op->ptr, "deselect"),
RNA_boolean_get(op->ptr, "toggle")),
.deselect_all = RNA_boolean_get(op->ptr, "deselect_all"),
.select_passthrough = RNA_boolean_get(op->ptr, "select_passthrough"),
};
return uv_mouse_select(C, co, extend, deselect_all);
const bool changed = uv_mouse_select(C, co, &params);
if (changed) {
return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH;
}
return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
}
static int uv_select_invoke(bContext *C, wmOperator *op, const wmEvent *event)
@ -2629,18 +2666,8 @@ void UV_OT_select(wmOperatorType *ot)
/* properties */
PropertyRNA *prop;
prop = RNA_def_boolean(ot->srna,
"extend",
0,
"Extend",
"Extend selection rather than clearing the existing selection");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
prop = RNA_def_boolean(ot->srna,
"deselect_all",
false,
"Deselect On Nothing",
"Deselect all when nothing under the cursor");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
WM_operator_properties_mouse_select(ot);
prop = RNA_def_float_vector(
ot->srna,