Merging r58475 through r58700 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / bmesh / operators / bmo_connect.c
index a6b0d9c522b0a26334460ddf862a8788584557ce..c718cac4bd6f8edaa799be29c200ae6b19c1360c 100644 (file)
@@ -29,8 +29,8 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
-#include "BLI_array.h"
 #include "BLI_utildefines.h"
+#include "BLI_alloca.h"
 
 #include "bmesh.h"
 
@@ -83,7 +83,7 @@ static int bm_face_connect_verts(BMesh *bm, BMFace *f)
                l_pair[1] = loops_split[0][0];
        }
 
-       BM_face_legal_splits(bm, f, loops_split, STACK_SIZE(loops_split));
+       BM_face_legal_splits(f, loops_split, STACK_SIZE(loops_split));
 
        for (i = 0; i < STACK_SIZE(loops_split); i++) {
                BMVert **v_pair;