diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-21 16:23:06 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-21 16:23:06 +0300 |
| commit | 494d13115cbbf47060eb83f64a4bd958c0d406bc (patch) | |
| tree | 10d7877406180bf510678eed78242305f571e15e /source/blender | |
| parent | c9df453ce70bdf36a4567f8a97b977c1f5e6dfd7 (diff) | |
Fix T59687: Crash when rendering animation
The issue was caused by shape keys datablock from evaluated mesh
being added to the main database.
This commit makes it so shape keys are not copied for the mesh
used as cage.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_convert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index de131b9be47..995a67e6659 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -971,8 +971,8 @@ Mesh *BKE_mesh_new_from_object( /* copies object and modifiers (but not the data) */ if (cage) { /* copies the data */ - tmpmesh = BKE_mesh_copy(bmain, ob->data); - + Mesh *mesh = ob->data; + BKE_id_copy_ex(bmain, &mesh->id, (ID **)&tmpmesh, 0, false); /* XXX BKE_mesh_copy() already handles materials usercount. */ do_mat_id_data_us = false; } |