diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-06-23 14:18:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-23 14:18:51 +0400 |
| commit | 2567129e7fe7a2a4439ee6c9607d3eb5660e7d7c (patch) | |
| tree | 2d312e1c235f4347a9d721a9fd753c01d75a5d37 /source/blender/blenkernel/intern | |
| parent | 16b15961a8d7f0a8f831f726eba10785322171ed (diff) | |
Converting a mesh into a mesh (alt-c), was broken with shape keys and modifiers that changed the vertex count.
removal of the shape key was undone in DM_to_mesh().
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 339326f75d5..d5ece6ae31f 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -247,8 +247,8 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me) /* if the number of verts has changed, remove invalid data */ if(tmp.totvert != me->totvert) { - if(me->key) me->key->id.us--; - me->key = NULL; + if(tmp.key) tmp.key->id.us--; + tmp.key = NULL; } *me = tmp; |