diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-21 12:55:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-21 12:55:10 +0400 |
| commit | cb06c4eee17a9724cf39f9694c1e68581dcb1a12 (patch) | |
| tree | dd8f001cd874f389b9e2d9f6ac303a4d5d2bee16 /source/blender/editors/mesh/editmesh_mods.c | |
| parent | c3d1e1f3e90a8ec56521ba42913763fb81c54f53 (diff) | |
remove checks on deprecated multires pointer.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_mods.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_mods.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index 050832cf8f6..789c5c9c749 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -140,8 +140,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)) && - (me->mr==NULL) + (obedit && obedit->type==OB_MESH && (obedit->mode & OB_MODE_EDIT)) ) { EditMesh *em= me->edit_mesh; |