diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-15 07:58:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-15 08:01:39 +0300 |
| commit | 0ef4c4e12a95cbe49af6e42b6e20a6d69547796c (patch) | |
| tree | 5f486c266d854272e92f2d0ca4577f121578eb48 /source/blender/blenkernel/intern/mesh_convert.c | |
| parent | 62a3dfec78ca9691b6f93a0017171045440c40a7 (diff) | |
Mesh: remove DerivedMesh for displist conversion
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_convert.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_convert.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index b64cb8a1d0f..eed02dae824 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -857,7 +857,7 @@ Mesh *BKE_mesh_new_from_object( case OB_SURF: { ListBase dispbase = {NULL, NULL}; - DerivedMesh *derivedFinal = NULL; + Mesh *me_eval_final = NULL; int uv_from_orco; /* copies object and modifiers (but not the data) */ @@ -899,12 +899,12 @@ Mesh *BKE_mesh_new_from_object( copycu->editnurb = tmpcu->editnurb; /* get updated display list, and convert to a mesh */ - BKE_displist_make_curveTypes_forRender(depsgraph, sce, tmpobj, &dispbase, &derivedFinal, false, render); + BKE_displist_make_curveTypes_forRender(depsgraph, sce, tmpobj, &dispbase, &me_eval_final, false, render); copycu->editfont = NULL; copycu->editnurb = NULL; - tmpobj->derivedFinal = derivedFinal; + tmpobj->runtime.mesh_eval = me_eval_final; /* convert object type to mesh */ uv_from_orco = (tmpcu->flag & CU_UV_ORCO) != 0; |