[Bf-blender-cvs] [494d13115cb] master: Fix T59687: Crash when rendering animation

[Sergey Sharybin]

Commit: 494d13115cbbf47060eb83f64a4bd958c0d406bc
Author: Sergey Sharybin
Date:   Fri Dec 21 14:23:06 2018 +0100
Branches: master
https://developer.blender.org/rB494d13115cbbf47060eb83f64a4bd958c0d406bc

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.

===================================================================

M	source/blender/blenkernel/intern/mesh_convert.c

===================================================================

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;
 			}