Merge branch 'master' into next

optigon · Jun 13, 2009 · be440e1 · be440e1
2 parents 192ed6d + 5b84e58
commit be440e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/NOTES-1.0 b/NOTES-1.0
@@ -1,3 +1,6 @@
+--- 1.0.X -------------------------------------------------------------------
+- Edge|Collapse could crash in some cases. Now fixed. [optigon]
+
 --- 1.0.1 -------------------------------------------------------------------
 - Magnets are now drawn correctly in Tweak when selections across multiple
   objects are dragged. [optigon]

diff --git a/src/wings_collapse.erl b/src/wings_collapse.erl
@@ -193,11 +193,15 @@ collapse_edge_1(Edge, Vkeep, Rec, We0) ->
 	false ->
 	    We1 = internal_collapse_edge(Edge, Vkeep, Vremove, Rec, We0),
 	    We2 = delete_bad_faces(Faces, We1),
-	    SurrFaces = wings_face:from_vs([Vkeep], We2),
-	    We = delete_bad_faces(SurrFaces, We2),
-	    case We of
+	    case We2 of
 		bad_edge -> We0;
-		_ -> We
+		_ ->
+		  SurrFaces = wings_face:from_vs([Vkeep], We2),
+		  We = delete_bad_faces(SurrFaces, We2),
+		  case We of
+			bad_edge -> We0;
+			_ -> We
+		  end
 	    end
     end.