Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-02-12 19:04:59 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-02-12 19:05:32 +0300
commitf16763a01dfb0b9fe534d468740f49e147ea12a6 (patch)
treeaed1ec820555c3f98699875a8fe9f00349c376af /source/blender/blenkernel/intern/object_dupli.c
parent5aacad16e072ab1f2e76bd75219562f36fab2807 (diff)
Fix T60999: Duplifaced objects are not drawn in edit mode
Seems to be rather trivial change to use proper cage mesh nowadays.
Diffstat (limited to 'source/blender/blenkernel/intern/object_dupli.c')
-rw-r--r--source/blender/blenkernel/intern/object_dupli.c6
1 files changed, 2 insertions, 4 deletions
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;