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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2020-01-26 18:35:42 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-01-27 14:18:43 +0300
commit62ec19f37c79a4631fafb78be16554e740366aba (patch)
tree1876ac30a14244b65c0ef740c0af49155e04cd25 /source/blender/blenkernel/intern/multires.c
parentc055d69f83edfaa67eb771cbe87271af60a80221 (diff)
Cleanup: removed unused derivedDeform and derivedFinal
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
-rw-r--r--source/blender/blenkernel/intern/multires.c18
1 files changed, 5 insertions, 13 deletions
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,