diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-14 06:09:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-14 06:09:24 +0300 |
commit | ff752f6dbc00a5c67724d568eef510596953d864 (patch) | |
tree | a19ce569ce1cdc68e18beed9cda8a0d9434b7b75 /source | |
parent | 8b1dcd3b253a0dd4d7006c0ff2a0c5139ab4fb4c (diff) |
Cleanup: remove redundant UV select linked options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 4c5d626fa8f..5d73f0c8b04 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -2695,7 +2695,8 @@ static int uv_select_linked_internal(bContext *C, wmOperator *op, const wmEvent ViewLayer *view_layer = CTX_data_view_layer(C); Image *ima = CTX_data_edit_image(C); float limit[2]; - int extend, deselect; + bool extend = true; + bool deselect = false; bool select_faces = (ts->uv_flag & UV_SYNC_SELECTION) && (ts->selectmode & SCE_SELECT_FACE); UvNearestHit hit = UV_NEAREST_HIT_INIT; @@ -2705,8 +2706,10 @@ static int uv_select_linked_internal(bContext *C, wmOperator *op, const wmEvent return OPERATOR_CANCELLED; } - extend = RNA_boolean_get(op->ptr, "extend"); - deselect = RNA_boolean_get(op->ptr, "deselect"); + if (pick) { + extend = RNA_boolean_get(op->ptr, "extend"); + deselect = RNA_boolean_get(op->ptr, "deselect"); + } uvedit_pixel_to_float(sima, limit, 0.05f); uint objects_len = 0; @@ -2775,11 +2778,6 @@ static void UV_OT_select_linked(wmOperatorType *ot) /* api callbacks */ ot->exec = uv_select_linked_exec; ot->poll = ED_operator_uvedit; /* requires space image */ - - /* properties */ - RNA_def_boolean(ot->srna, "extend", 0, - "Extend", "Extend selection rather than clearing the existing selection"); - RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Deselect linked UV vertices rather than selecting them"); } /** \} */ |