[Bf-blender-cvs] [ad393e1] master: Fix assert in the wrong place, should be moved earlier to do anything.

Chase Willden noreply at git.blender.org
Sun Oct 16 16:10:18 CEST 2016


Commit: ad393e1e75afd7b02ae8a308d5fec188ff5c9b03
Author: Chase Willden
Date:   Sun Oct 16 15:50:53 2016 +0200
Branches: master
https://developer.blender.org/rBad393e1e75afd7b02ae8a308d5fec188ff5c9b03

Fix assert in the wrong place, should be moved earlier to do anything.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D2304

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

M	source/blender/bmesh/tools/bmesh_bevel.c

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

diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 45fbfdd..6c168bd 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -3855,9 +3855,10 @@ static bool bev_rebuild_polygon(BMesh *bm, BevelParams *bp, BMFace *f)
 			bv = find_bevvert(bp, l->v);
 			vm = bv->vmesh;
 			e = find_edge_half(bv, l->e);
+			BLI_assert(e != NULL);
 			bme = e->e;
 			eprev = find_edge_half(bv, lprev->e);
-			BLI_assert(e != NULL && eprev != NULL);
+			BLI_assert(eprev != NULL);
 
 			/* which direction around our vertex do we travel to match orientation of f? */
 			if (e->prev == eprev) {




More information about the Bf-blender-cvs mailing list