[Bf-blender-cvs] [c1ec73f] master: Fix T41631: Connect acts on unrelated vert

Campbell Barton noreply at git.blender.org
Fri Aug 29 16:16:04 CEST 2014


Commit: c1ec73f52218900b1ce101b3154816205aa75d0d
Author: Campbell Barton
Date:   Sat Aug 30 00:13:56 2014 +1000
Branches: master
https://developer.blender.org/rBc1ec73f52218900b1ce101b3154816205aa75d0d

Fix T41631: Connect acts on unrelated vert

===================================================================

M	source/blender/bmesh/operators/bmo_connect_pair.c

===================================================================

diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c b/source/blender/bmesh/operators/bmo_connect_pair.c
index 426e209..fe4f504 100644
--- a/source/blender/bmesh/operators/bmo_connect_pair.c
+++ b/source/blender/bmesh/operators/bmo_connect_pair.c
@@ -468,9 +468,7 @@ void bmo_connect_vert_pair_exec(BMesh *bm, BMOperator *op)
 					BLI_remlink(&pc.state_lb, state);
 					MEM_freeN(state);
 				}
-				else {
-					found_all = false;
-				}
+				found_all = false;
 			}
 			else {
 				/* didn't reach the end, remove it,
@@ -481,6 +479,11 @@ void bmo_connect_vert_pair_exec(BMesh *bm, BMOperator *op)
 		}
 
 		if (found_all) {
+#ifdef DEBUG
+			for (state = pc.state_lb.first; state; state = state->next) {
+				BLI_assert(state->link_last->ele == (BMElem *)pc.v_b);
+			}
+#endif
 			break;
 		}
 	}




More information about the Bf-blender-cvs mailing list