diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-20 13:39:48 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-20 16:53:41 +0300 |
| commit | fd926f005868858c6740de0835b2bbaf7a86318c (patch) | |
| tree | 447db87edde4997d7ff4fced862394daf6a3e7f2 /source/blender/blenkernel/intern/DerivedMesh.c | |
| parent | 1ee8c3e46a7ab199750373b53050e9b54c5ac9cc (diff) | |
Modifier stack: Only ensure derived mesh when USE_DERIVEDMESH is defined
This is more an internal transition away from derived mesh.
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 0fc1270ff0b..3d3a876f0e6 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2013,15 +2013,19 @@ static void mesh_build_data( mesh_finalize_eval(ob); +#ifdef USE_DERIVEDMESH /* TODO(campbell): remove these copies, they are expected in various places over the code. */ ob->derivedDeform = CDDM_from_mesh_ex(ob->runtime.mesh_deform_eval, CD_REFERENCE, CD_MASK_MESH); ob->derivedFinal = CDDM_from_mesh_ex(ob->runtime.mesh_eval, CD_REFERENCE, CD_MASK_MESH); +#endif BKE_object_boundbox_calc_from_mesh(ob, ob->runtime.mesh_eval); BKE_mesh_texspace_copy_from_object(ob->runtime.mesh_eval, ob); +#ifdef USE_DERIVEDMESH ob->derivedFinal->needsFree = 0; ob->derivedDeform->needsFree = 0; +#endif ob->lastDataMask = dataMask; ob->lastNeedMapping = need_mapping; |