[Bf-blender-cvs] [1f5dd9c437c] blender2.8: Fix T58788: Apply Visual Geometry crash

[Campbell Barton]

Commit: 1f5dd9c437cce27cf5a4498b1b7d31f4b9f9b8f2
Author: Campbell Barton
Date:   Thu Dec 6 18:28:32 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB1f5dd9c437cce27cf5a4498b1b7d31f4b9f9b8f2

Fix T58788: Apply Visual Geometry crash

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

M	source/blender/editors/object/object_add.c

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

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 30c7811fa0b..b6641d6b101 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1923,10 +1923,10 @@ static int convert_exec(bContext *C, wmOperator *op)
 			/* note: get the mesh from the original, not from the copy in some
 			 * cases this doesn't give correct results (when MDEF is used for eg)
 			 */
-			Mesh *me_eval = mesh_get_eval_final(depsgraph, scene, newob, CD_MASK_MESH);
-			if (newob->runtime.mesh_eval == me_eval) {
-				newob->runtime.mesh_eval = NULL;
-			}
+			Scene *scene_eval = (Scene *)DEG_get_evaluated_id(depsgraph, &scene->id);
+			Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
+			Mesh *me_eval = mesh_get_eval_final(depsgraph, scene_eval, ob_eval, CD_MASK_MESH);
+			me_eval = BKE_mesh_copy_for_eval(me_eval, false);
 			BKE_mesh_nomain_to_mesh(me_eval, newob->data, newob, CD_MASK_MESH, true);
 			BKE_object_free_modifiers(newob, 0);   /* after derivedmesh calls! */
 		}