diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-08 19:50:42 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-08 19:50:42 +0400 |
| commit | ff07676b4047719236186e605d6578e1816b6cdc (patch) | |
| tree | d8367201058cd81f3b7b6f56f283721596b3f0ca /source/blender/editors/mesh/mesh_intern.h | |
| parent | 66634e2be41be8530bec49b3bab27dfa4ea176d3 (diff) | |
bring back automerge - [#19538] automerge editing doesn't work
Diffstat (limited to 'source/blender/editors/mesh/mesh_intern.h')
| -rw-r--r-- | source/blender/editors/mesh/mesh_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index 37a6d0f384f..7ee7fe1ebde 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -167,7 +167,7 @@ void MESH_OT_vertices_smooth(struct wmOperatorType *ot); void MESH_OT_flip_normals(struct wmOperatorType *ot); extern EditEdge *findnearestedge(ViewContext *vc, int *dist); -extern void EM_automerge(int update); +extern void EM_automerge(Scene *scene, Object *obedit, int update); void editmesh_select_by_material(EditMesh *em, int index); void righthandfaces(EditMesh *em, int select); /* makes faces righthand turning */ void EM_select_more(EditMesh *em); |