[Bf-blender-cvs] [f16763a01df] master: Fix T60999: Duplifaced objects are not drawn in edit mode

[Sergey Sharybin]

Commit: f16763a01dfb0b9fe534d468740f49e147ea12a6
Author: Sergey Sharybin
Date:   Tue Feb 12 17:04:59 2019 +0100
Branches: master
https://developer.blender.org/rBf16763a01dfb0b9fe534d468740f49e147ea12a6

Fix T60999: Duplifaced objects are not drawn in edit mode

Seems to be rather trivial change to use proper cage mesh nowadays.

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

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

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

diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 9b1d5a63356..4c10e5af89e 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -403,8 +403,7 @@ static void make_duplis_verts(const DupliContext *ctx)
 		 * during meta balls evaluation. But even without those all the objects
 		 * which are needed for correct instancing are already evaluated. */
 		if (vdd.edit_btmesh != NULL) {
-			/* XXX TODO replace with equivalent of editbmesh_get_eval_cage when available. */
-			vdd.me_eval = parent->runtime.mesh_deform_eval;
+			vdd.me_eval = vdd.edit_btmesh->mesh_eval_cage;
 		}
 		else {
 			vdd.me_eval = parent->runtime.mesh_eval;
@@ -678,8 +677,7 @@ static void make_duplis_faces(const DupliContext *ctx)
 		 * during meta balls evaluation. But even without those all the objects
 		 * which are needed for correct instancing are already evaluated. */
 		if (em != NULL) {
-			/* XXX TODO replace with equivalent of editbmesh_get_eval_cage when available. */
-			fdd.me_eval = parent->runtime.mesh_deform_eval;
+			fdd.me_eval = em->mesh_eval_cage;
 		}
 		else {
 			fdd.me_eval = parent->runtime.mesh_eval;