[Bf-blender-cvs] [f8bdd8e] master: BMesh: correct bmesh_edge_vert_swap

Campbell Barton noreply at git.blender.org
Thu Apr 30 22:52:42 CEST 2015


Commit: f8bdd8e6a8ea5bef16789c5d61cbb9f4ff239945
Author: Campbell Barton
Date:   Fri May 1 06:51:16 2015 +1000
Branches: master
https://developer.blender.org/rBf8bdd8e6a8ea5bef16789c5d61cbb9f4ff239945

BMesh: correct bmesh_edge_vert_swap

Missed swapping out loops.

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

M	source/blender/bmesh/intern/bmesh_structure.c

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

diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c
index 5bc36ce..cb30213 100644
--- a/source/blender/bmesh/intern/bmesh_structure.c
+++ b/source/blender/bmesh/intern/bmesh_structure.c
@@ -70,6 +70,12 @@ void bmesh_edge_vert_swap(BMEdge *e, BMVert *v_dst, BMVert *v_src)
 			if (l_iter->v == v_src) {
 				l_iter->v = v_dst;
 			}
+			else if (l_iter->next->v == v_src) {
+				l_iter->next->v = v_dst;
+			}
+			else {
+				BLI_assert(l_iter->prev->v != v_src);
+			}
 		} while ((l_iter = l_iter->radial_next) != l_first);
 	}




More information about the Bf-blender-cvs mailing list