diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-21 15:54:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-21 16:33:10 +0300 |
| commit | 1859215576ce522699c7cdd749065e73edfc60c2 (patch) | |
| tree | 474028cc6a1e544ac1b7fab02e22103c2e1e2935 /source/blender | |
| parent | fffff5a9931931a5706fcd6de7743b3021bc09c2 (diff) | |
Cleanup: some potentially critical changes in data transfer.
Removing that stuff should be valid with new depsgraph/modifiers stack
evaluation system... BUT it might not be, so rather have those in
separate own well-isolated commit.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/data_transfer.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 208adf53bef..78838c7f4ed 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -1150,11 +1150,10 @@ bool BKE_object_data_transfer_dm( * of data in it (multi-threaded evaluation of the modifier stack, see T46672). */ /* XXX TODO new depsgraph shall always ensure we have that src evaluated mesh built before this point, now, I think? */ - dm_src = dm_dst ? ob_src->runtime.mesh_eval : mesh_get_eval_final(depsgraph, scene, ob_src, dm_src_mask); + dm_src = mesh_get_eval_final(depsgraph, scene, ob_src, dm_src_mask); if (!dm_src) { return changed; } -// dm_src = CDDM_copy(dm_src); if (auto_transform) { MVert *verts_dst = dm_dst ? dm_dst->mvert : me_dst->mvert; @@ -1445,7 +1444,6 @@ bool BKE_object_data_transfer_dm( BKE_mesh_remap_free(&geom_map[i]); MEM_SAFE_FREE(weights[i]); } -// dm_src->release(dm_src); return changed; |