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:
authorCampbell Barton <ideasman42@gmail.com>2018-10-09 08:52:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-10-09 09:48:28 +0300
commit1b910082a0effdeb06653203b1d773094a2068e5 (patch)
tree3657576cafbcdf82f32b44c2ea64710c263074eb /source/blender/blenkernel/intern/object.c
parent79ca13a7456e34ab961ae2fd46c96b9bc6c03f91 (diff)
Edit Mesh: replace DerivedMesh w/ Mesh
DerivedMesh is now removed from edit-mesh modifier evaluation.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r--source/blender/blenkernel/intern/object.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 71cf08e267d..b1d994b6e18 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2052,7 +2052,11 @@ static void give_parvert(Object *par, int nr, float vec[3])
BMEditMesh *em = me->edit_btmesh;
DerivedMesh *dm;
+#if 0 /* FIXME(campbell): use mesh for both. */
dm = (em) ? em->derivedFinal : par->derivedFinal;
+#else
+ dm = par->derivedFinal;
+#endif
if (dm) {
int count = 0;