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:
authormano-wii <germano.costa@ig.com.br>2020-01-02 03:06:59 +0300
committermano-wii <germano.costa@ig.com.br>2020-01-02 03:06:59 +0300
commitd27fb4671512a3834b61c5c350f428ddccc4669e (patch)
tree698c1355f9393c99dca24783bbbc6d6666ebc3e0 /source/blender/editors/include
parent86a2ffc3ab321f00317aa05fb423c4df6f68aced (diff)
EditMesh: Improve AutoMerge with Split Edges & Faces
Previously, compared to `Auto Merge` without `Split Edges & Faces`, `Auto Merge` with this option ignored duplicates between selected vertices. It only considered duplicates between selected vertices and unselected vertices. This is a regress and not a progress. This commit implements this behavior, so this option matches the other `Auto Merge`.
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r--source/blender/editors/include/ED_mesh.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index 90ad90058e7..b28f645e982 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -144,9 +144,9 @@ bool BMBVH_EdgeVisible(struct BMBVHTree *tree,
/* editmesh_automerge.c */
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 bool split_edges,
+ const bool split_faces,
+ const bool update,
const char hflag,
const float dist);