Merging r58475 through r58700 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / bmesh / tools / bmesh_decimate.h
index c77cb18c5187c980b7b51e9aa6a84e3ca17f5f97..a1b26990587eb429409c571ee0802dba92b3afc5 100644 (file)
@@ -35,7 +35,8 @@ void BM_mesh_decimate_unsubdivide(BMesh *bm, const int iterations);
 void BM_mesh_decimate_dissolve_ex(BMesh *bm, const float angle_limit, const bool do_dissolve_boundaries,
                                   const BMO_Delimit delimit,
                                   BMVert **vinput_arr, const int vinput_len,
-                                  BMEdge **einput_arr, const int einput_len);
+                                  BMEdge **einput_arr, const int einput_len,
+                                  const short oflag_out);
 void BM_mesh_decimate_dissolve(BMesh *bm, const float angle_limit, const bool do_dissolve_boundaries,
                                const BMO_Delimit delimit);