archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

prevent assert: select-linked UV delimit w/o UV's

Browse Source
This commit is contained in:
Campbell Barton
2015-09-22 23:51:34 +10:00
parent c3ebab3e45
commit ad873ca92d
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/mesh/editmesh_select.c
View File

@@ -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);
}