Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-08-24 20:55:25 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-08-24 20:55:25 +0400
commitd3a566457b8272a1a34be59569856305c9777c65 (patch)
tree7d2ab1572acd5e5477cdf99cb181337029252d07 /source/blender/bmesh/operators/bmo_connect.c
parent2536362f7955be7e86c9ed660a7b240060b1984d (diff)
fix for merged bridge crashing on closed loops (own bug in recent commit)
Diffstat (limited to 'source/blender/bmesh/operators/bmo_connect.c')
-rw-r--r--source/blender/bmesh/operators/bmo_connect.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c
index c9a0d74de38..5b317aebbf0 100644
--- a/source/blender/bmesh/operators/bmo_connect.c
+++ b/source/blender/bmesh/operators/bmo_connect.c
@@ -429,8 +429,7 @@ void bmo_bridge_loops_exec(BMesh *bm, BMOperator *op)
/* merge loops of bridge faces */
if (use_merge) {
- /* at the moment these will be the same */
- const int vert_len = mini(BLI_array_count(vv1), BLI_array_count(vv2));
+ const int vert_len = mini(BLI_array_count(vv1), BLI_array_count(vv2)) - ((cl1 || cl2) ? 1 : 0);
const int edge_len = mini(BLI_array_count(ee1), BLI_array_count(ee2));
if (merge_factor <= 0.0f) {