diff options
author | mano-wii <germano.costa@ig.com.br> | 2020-01-16 15:16:46 +0300 |
---|---|---|
committer | mano-wii <germano.costa@ig.com.br> | 2020-01-16 15:16:46 +0300 |
commit | e7e454f964f9751dc6664b9e42aff9e87552d8de (patch) | |
tree | 3f0395d205bfb53f89ce02a8552dd7f2cd82ef5a /source/blender/editors/transform | |
parent | 003be8aa7c6d837d43bdadb99f60cd5f6dca72bd (diff) | |
parent | 9a6551543b92d54e7d565570988271e461104a89 (diff) |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform_convert_mesh.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c index 006f913f218..5d3d1d936a2 100644 --- a/source/blender/editors/transform/transform_convert_mesh.c +++ b/source/blender/editors/transform/transform_convert_mesh.c @@ -1451,7 +1451,8 @@ void createTransUVs(bContext *C, TransInfo *t) if (is_prop_connected || is_island_center) { /* create element map with island information */ 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) { continue; } @@ -1547,16 +1548,17 @@ void createTransUVs(bContext *C, TransInfo *t) if (is_prop_connected || is_island_center) { UvElement *element = BM_uv_element_get(elementmap, efa, l); - - if (is_prop_connected) { - if (!BLI_BITMAP_TEST(island_enabled, element->island)) { - count_rejected++; - continue; + if (element) { + if (is_prop_connected) { + if (!BLI_BITMAP_TEST(island_enabled, element->island)) { + count_rejected++; + continue; + } } - } - if (is_island_center) { - center = island_center[element->island].co; + if (is_island_center) { + center = island_center[element->island].co; + } } } |