Merging r58475 through r58700 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / bmesh / tools / bmesh_decimate.h
index d3eaf1c667025979e99976814b919188cc380941..a1b26990587eb429409c571ee0802dba92b3afc5 100644 (file)
@@ -33,9 +33,12 @@ void BM_mesh_decimate_unsubdivide_ex(BMesh *bm, const int iterations, const bool
 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);
-void BM_mesh_decimate_dissolve(BMesh *bm, const float angle_limit, const bool do_dissolve_boundaries);
+                                  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);
 
 /* these weights are accumulated so too high values may reach 'inf' too quickly */
 #define BM_MESH_DECIM_WEIGHT_MAX 100000.0f