Commit: 1859215576ce522699c7cdd749065e73edfc60c2
Author: Bastien Montagne
Date: Thu Jun 21 14:54:03 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1859215576ce522699c7cdd749065e73edfc60c2
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.
===================================================================
M source/blender/blenkernel/intern/data_transfer.c
===================================================================
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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
