diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-09-22 16:51:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-09-22 20:00:30 +0300 |
commit | ad873ca92da0e795b712fe054356d5124e2dab44 (patch) | |
tree | 082f0da64649a7e6d2c4ffd16b552c881b72e89a /source/blender/editors/mesh/editmesh_select.c | |
parent | c3ebab3e452ae5c33a79386486181828e30092e1 (diff) |
prevent assert: select-linked UV delimit w/o UV's
Diffstat (limited to 'source/blender/editors/mesh/editmesh_select.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 112edef5120..7f22ff7c241 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -2389,6 +2389,15 @@ static bool select_linked_delimit_test( return false; } +static void select_linked_delimit_validate(BMesh *bm, int *delimit) +{ + if ((*delimit) & BMO_DELIM_UV) { + if (!CustomData_has_layer(&bm->ldata, CD_MLOOPUV)) { + (*delimit) &= ~BMO_DELIM_UV; + } + } +} + static void select_linked_delimit_begin(BMesh *bm, short selectmode, int delimit) { struct DelimitData delimit_data = {0}; @@ -2441,7 +2450,9 @@ static int edbm_select_linked_exec(bContext *C, wmOperator *op) BMIter iter; BMWalker walker; - const int delimit = RNA_enum_get(op->ptr, "delimit"); + int delimit = RNA_enum_get(op->ptr, "delimit"); + + select_linked_delimit_validate(bm, &delimit); if (delimit) { select_linked_delimit_begin(em->bm, em->selectmode, delimit); @@ -2607,6 +2618,8 @@ static void edbm_select_linked_pick_ex( BMesh *bm = em->bm; BMWalker walker; + select_linked_delimit_validate(bm, &delimit); + if (delimit) { select_linked_delimit_begin(bm, em->selectmode, delimit); } |