Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/mesh')
-rwxr-xr-xsource/blender/editors/mesh/knifetool.c6
-rw-r--r--source/blender/editors/mesh/mesh_intern.h9
2 files changed, 4 insertions, 11 deletions
diff --git a/source/blender/editors/mesh/knifetool.c b/source/blender/editors/mesh/knifetool.c
index 5e50990b863..e08db8b6e46 100755
--- a/source/blender/editors/mesh/knifetool.c
+++ b/source/blender/editors/mesh/knifetool.c
@@ -180,7 +180,8 @@ static void knife_project_v3(knifetool_opdata *kcd, const float co[3], float sco
ED_view3d_project_float(kcd->ar, co, sco, kcd->projmat);
}
-static ListBase *knife_empty_list(knifetool_opdata *kcd) {
+static ListBase *knife_empty_list(knifetool_opdata *kcd)
+{
ListBase *lst;
lst = BLI_memarena_alloc(kcd->arena, sizeof(ListBase));
@@ -188,7 +189,8 @@ static ListBase *knife_empty_list(knifetool_opdata *kcd) {
return lst;
}
-static void knife_append_list(knifetool_opdata *kcd, ListBase *lst, void *elem) {
+static void knife_append_list(knifetool_opdata *kcd, ListBase *lst, void *elem)
+{
Ref *ref;
ref = BLI_mempool_calloc(kcd->refs);
diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h
index e495908b56e..c75f85a2794 100644
--- a/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@ -148,15 +148,6 @@ void MESH_OT_select_next_loop(struct wmOperatorType *ot);
extern struct EnumPropertyItem *corner_type_items;
-#if 0 /* REMOVE AFTER BMESH MERGE */
-
-void join_triangles(EditMesh *em);
-int removedoublesflag(EditMesh *em, short flag, short automerge, float limit); /* return amount */
-void esubdivideflag(Object *obedit, EditMesh *em, int flag, float smooth, float fractal, int beautify, int numcuts, int corner_pattern, int seltype);
-int EdgeSlide(EditMesh *em, struct wmOperator *op, short immediate, float imperc);
-
-#endif
-
void MESH_OT_merge(struct wmOperatorType *ot);
void MESH_OT_subdivide(struct wmOperatorType *ot);
void MESH_OT_remove_doubles(struct wmOperatorType *ot);