diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-09 08:52:46 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-09 09:48:28 +0300 |
| commit | 1b910082a0effdeb06653203b1d773094a2068e5 (patch) | |
| tree | 3657576cafbcdf82f32b44c2ea64710c263074eb /source/blender/draw/intern | |
| parent | 79ca13a7456e34ab961ae2fd46c96b9bc6c03f91 (diff) | |
Edit Mesh: replace DerivedMesh w/ Mesh
DerivedMesh is now removed from edit-mesh modifier evaluation.
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index e1787c2650b..abf6db99f17 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -4464,12 +4464,13 @@ GPUBatch **DRW_mesh_batch_cache_get_surface_shaded( /* Hack to show the final result. */ const bool use_em_final = ( me->edit_btmesh && - me->edit_btmesh->derivedFinal && - (me->edit_btmesh->derivedFinal->type == DM_TYPE_CDDM)); + me->edit_btmesh->mesh_eval_final && + (me->edit_btmesh->mesh_eval_final->runtime.deformed_only == false)); Mesh me_fake; if (use_em_final) { - memset(&me_fake, 0x0, sizeof(me_fake)); - CDDM_to_mesh__fast_borrow(me->edit_btmesh->derivedFinal, &me_fake, me); + me_fake = *me->edit_btmesh->mesh_eval_final; + me_fake.mat = me->mat; + me_fake.totcol = me->totcol; me = &me_fake; } |