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:
authorCampbell Barton <ideasman42@gmail.com>2019-09-02 17:32:02 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-09-02 17:35:22 +0300
commita3559a70dd57110fd4e1cc568928ee1e3504959a (patch)
tree8beced38137ff9a86aebb30c4848891695cc80ca /source/blender/editors/include/ED_mesh.h
parent2356f60c6200188a2f88d6d890ff78fa8fd2b4d3 (diff)
Fix T69404: Merge by distance crash with Unselected
Error introduced when removing the automerge bmesh operator.
Diffstat (limited to 'source/blender/editors/include/ED_mesh.h')
-rw-r--r--source/blender/editors/include/ED_mesh.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index f2ef3a60bc5..ee4798430ef 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -139,13 +139,13 @@ bool BMBVH_EdgeVisible(struct BMBVHTree *tree,
struct Object *obedit);
/* editmesh_automerge.c */
-void EDBM_automerge(struct Scene *scene, struct Object *ob, bool update, const char hflag);
-void EDBM_automerge_and_split(struct Scene *scene,
- struct Object *ob,
+void EDBM_automerge(struct Object *ob, bool update, const char hflag, const float dist);
+void EDBM_automerge_and_split(struct Object *ob,
bool split_edges,
bool split_faces,
bool update,
- const char hflag);
+ const char hflag,
+ const float dist);
/* editmesh_undo.c */
void ED_mesh_undosys_type(struct UndoType *ut);