[Bf-blender-cvs] [c0ea309] master: Correct error in recent refactor

Campbell Barton noreply at git.blender.org
Thu Jun 25 14:16:20 CEST 2015


Commit: c0ea3099c5f18ad6f978896b560c4d015ad12a35
Author: Campbell Barton
Date:   Thu Jun 25 22:11:25 2015 +1000
Branches: master
https://developer.blender.org/rBc0ea3099c5f18ad6f978896b560c4d015ad12a35

Correct error in recent refactor

Closed loops missed last line

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

M	source/blender/editors/mesh/editmesh_loopcut.c

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

diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index 191997f..74a40a2 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -237,10 +237,13 @@ static void edgering_preview_calc_edges(RingSelOpData *lcd, DerivedMesh *dm, con
 	edge_stack = BLI_stack_new(sizeof(BMEdge *), __func__);
 
 	eed_last = NULL;
-	for (eed = eed_start = BMW_begin(&walker, eed_start); eed; eed = BMW_step(&walker)) {
+	for (eed = eed_last = BMW_begin(&walker, lcd->eed); eed; eed = BMW_step(&walker)) {
 		BLI_stack_push(edge_stack, &eed);
-		eed_last = eed;
 	}
+	BMW_end(&walker);
+
+
+	eed_start = *(BMEdge **)BLI_stack_peek(edge_stack);
 
 	edges = MEM_mallocN(
 	        (sizeof(*edges) * (BLI_stack_count(edge_stack) + (eed_last != eed_start))) * previewlines, __func__);
@@ -310,7 +313,6 @@ static void edgering_preview_calc_edges(RingSelOpData *lcd, DerivedMesh *dm, con
 
 	BLI_stack_free(edge_stack);
 
-	BMW_end(&walker);
 	lcd->edges = edges;
 	lcd->totedge = tot;
 }




More information about the Bf-blender-cvs mailing list