From 62ec19f37c79a4631fafb78be16554e740366aba Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 26 Jan 2020 16:35:42 +0100 Subject: Cleanup: removed unused derivedDeform and derivedFinal --- source/blender/blenkernel/intern/multires.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'source/blender/blenkernel/intern/multires.c') diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index a539aa45cf6..23fa8dd60d5 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -1289,13 +1289,9 @@ void multires_modifier_update_mdisps(struct DerivedMesh *dm, Scene *scene) int i, j, numGrids, highGridSize, lowGridSize; const bool has_mask = CustomData_has_layer(&me->ldata, CD_GRID_PAINT_MASK); - /* create subsurf DM from original mesh at high level */ - if (ob->derivedDeform) { - cddm = CDDM_copy(ob->derivedDeform); - } - else { - cddm = CDDM_from_mesh(me); - } + /* Create subsurf DM from original mesh at high level. */ + /* TODO: use mesh_deform_eval when sculpting on deformed mesh. */ + cddm = CDDM_from_mesh(me); DM_set_only_copy(cddm, &CD_MASK_BAREMESH); highdm = subsurf_dm_create_local(scene, @@ -1369,12 +1365,8 @@ void multires_modifier_update_mdisps(struct DerivedMesh *dm, Scene *scene) DerivedMesh *cddm, *subdm; const bool has_mask = CustomData_has_layer(&me->ldata, CD_GRID_PAINT_MASK); - if (ob->derivedDeform) { - cddm = CDDM_copy(ob->derivedDeform); - } - else { - cddm = CDDM_from_mesh(me); - } + /* TODO: use mesh_deform_eval when sculpting on deformed mesh. */ + cddm = CDDM_from_mesh(me); DM_set_only_copy(cddm, &CD_MASK_BAREMESH); subdm = subsurf_dm_create_local(scene, -- cgit v1.2.3