Merge with -r 22620:23107.
[blender.git] / source / blender / editors / include / ED_mesh.h
index a2dba89..1045da5 100644 (file)
@@ -118,6 +118,7 @@ void                EM_select_face(struct EditFace *efa, int sel);
 void           EM_select_face_fgon(struct EditMesh *em, struct EditFace *efa, int val);
 void           EM_select_swap(struct EditMesh *em);
 void           EM_toggle_select_all(struct EditMesh *em);
+void EM_select_all(struct EditMesh *em);
 void           EM_selectmode_flush(struct EditMesh *em);
 void           EM_deselect_flush(struct EditMesh *em);
 void           EM_selectmode_set(struct EditMesh *em);
@@ -154,6 +155,9 @@ void                EM_reveal_mesh(struct EditMesh *em);
 void           EM_select_by_material(struct EditMesh *em, int index);
 void           EM_deselect_by_material(struct EditMesh *em, int index); 
 
+/* editmesh_tools.c */
+void convert_to_triface(struct EditMesh *em, int direction);
+
 /* editface.c */
 struct MTFace  *EM_get_active_mtface(struct EditMesh *em, struct EditFace **act_efa, struct MCol **mcol, int sloppy);