[Bf-blender-cvs] [6b9d496] blender-v2.76-release: prevent assert: select-linked UV delimit w/o UV's
Campbell Barton
noreply at git.blender.org
Wed Sep 23 16:12:21 CEST 2015
Commit: 6b9d496aa5ef2184df90a8a93a32195071e301c0
Author: Campbell Barton
Date: Tue Sep 22 23:51:34 2015 +1000
Branches: blender-v2.76-release
https://developer.blender.org/rB6b9d496aa5ef2184df90a8a93a32195071e301c0
prevent assert: select-linked UV delimit w/o UV's
===================================================================
M source/blender/editors/mesh/editmesh_select.c
===================================================================
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 112edef..7f22ff7 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);
}
More information about the Bf-blender-cvs
mailing list