diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-09-19 17:29:04 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-09-19 17:29:04 +0300 |
commit | 3aaca08aad70d1aedca669d9f84de75d4dd7abd3 (patch) | |
tree | 599a0c4529a36ab621b88c0b694984340048042b /source/blender/bmesh/intern/bmesh_operators_private.h | |
parent | 38d93016746cc498f7b52ad1547de1548e3d1556 (diff) | |
parent | cfc109eb928951b402eb759350a7588290e614b9 (diff) |
Merge branch 'master' into strand_editmode
Conflicts:
source/blender/editors/sculpt_paint/paint_ops.c
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_operators_private.h')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operators_private.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/bmesh/intern/bmesh_operators_private.h b/source/blender/bmesh/intern/bmesh_operators_private.h index 8b9c25bf95c..c0896691fd3 100644 --- a/source/blender/bmesh/intern/bmesh_operators_private.h +++ b/source/blender/bmesh/intern/bmesh_operators_private.h @@ -83,6 +83,8 @@ void bmo_pointmerge_exec(BMesh *bm, BMOperator *op); void bmo_pointmerge_facedata_exec(BMesh *bm, BMOperator *op); void bmo_recalc_face_normals_exec(BMesh *bm, BMOperator *op); void bmo_poke_exec(BMesh *bm, BMOperator *op); +void bmo_offset_edgeloops_exec(BMesh *bm, BMOperator *op); +void bmo_planar_faces_exec(BMesh *bm, BMOperator *op); void bmo_region_extend_exec(BMesh *bm, BMOperator *op); void bmo_remove_doubles_exec(BMesh *bm, BMOperator *op); void bmo_reverse_colors_exec(BMesh *bm, BMOperator *op); |