diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-11 23:06:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-11 23:06:38 +0400 |
| commit | efed73598f7d571aa57468b31748c5777dbfc41f (patch) | |
| tree | d247e7a58bc1abf3cdebbada060e6507d457f83b /source/blender/editors/mesh/editmesh_mods.c | |
| parent | 7ac1c7c89956d5df7f99509917fd933002d2861d (diff) | |
Use OB_MODE_EDIT as a flag everywhere, also fixed a typo which made drawing the set-scene not work right.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_mods.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_mods.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index 3c3cdf25d7b..b790f1aceed 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -123,7 +123,7 @@ void EM_automerge(Scene *scene, Object *obedit, int update) int len; if ((scene->toolsettings->automerge) && - (obedit && obedit->type==OB_MESH && obedit->mode==OB_MODE_EDIT) && + (obedit && obedit->type==OB_MESH && (obedit->mode & OB_MODE_EDIT)) && (me->mr==NULL) ) { Mesh *me= (Mesh*)obedit->data; |