Fix crash with Proportional Edit Connected in UV editing

Caused by rB86a2ffc3ab32
This commit is contained in:
mano-wii
2020-01-16 09:14:27 -03:00
parent 3ee6d74f93
commit 9a6551543b

View File

@@ -1451,7 +1451,8 @@ void createTransUVs(bContext *C, TransInfo *t)
if (is_prop_connected || is_island_center) { if (is_prop_connected || is_island_center) {
/* create element map with island information */ /* create element map with island information */
const bool use_facesel = (ts->uv_flag & UV_SYNC_SELECTION) == 0; const bool use_facesel = (ts->uv_flag & UV_SYNC_SELECTION) == 0;
elementmap = BM_uv_element_map_create(em->bm, scene, use_facesel, true, false, true); const bool use_uvsel = !is_prop_connected;
elementmap = BM_uv_element_map_create(em->bm, scene, use_facesel, use_uvsel, false, true);
if (elementmap == NULL) { if (elementmap == NULL) {
continue; continue;
} }
@@ -1547,16 +1548,17 @@ void createTransUVs(bContext *C, TransInfo *t)
if (is_prop_connected || is_island_center) { if (is_prop_connected || is_island_center) {
UvElement *element = BM_uv_element_get(elementmap, efa, l); UvElement *element = BM_uv_element_get(elementmap, efa, l);
if (element) {
if (is_prop_connected) { if (is_prop_connected) {
if (!BLI_BITMAP_TEST(island_enabled, element->island)) { if (!BLI_BITMAP_TEST(island_enabled, element->island)) {
count_rejected++; count_rejected++;
continue; continue;
}
} }
}
if (is_island_center) { if (is_island_center) {
center = island_center[element->island].co; center = island_center[element->island].co;
}
} }
} }