[Bf-blender-cvs] [9bd7bd9f655] temp-modifier-rm-cddm: Use proper way to get CoW original
Sybren A. Stüvel
noreply at git.blender.org
Tue May 1 16:43:39 CEST 2018
Commit: 9bd7bd9f655dcce47b260dc1b4ae294a0944cd91
Author: Sybren A. Stüvel
Date: Tue May 1 16:36:53 2018 +0200
Branches: temp-modifier-rm-cddm
https://developer.blender.org/rB9bd7bd9f655dcce47b260dc1b4ae294a0944cd91
Use proper way to get CoW original
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 56eff1afdb9..a0050f4b653 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1165,7 +1165,7 @@ DerivedMesh *mesh_create_derived_for_modifier(
int numVerts;
/* Always get the vertex coordinates from the original mesh. Otherwise
* there is the risk of deforming already-deformed coordinates. */
- Mesh *mesh_orig_id = (me->id.tag & LIB_TAG_COPY_ON_WRITE) ? (Mesh *)me->id.orig_id : me;
+ Mesh *mesh_orig_id = (Mesh *)DEG_get_original_id(&me->id);
float (*deformedVerts)[3] = BKE_mesh_vertexCos_get(mesh_orig_id, &numVerts);
modwrap_deformVerts(md, &mectx, NULL, deformedVerts, numVerts);
@@ -1754,7 +1754,7 @@ static void mesh_calc_modifiers(
Mesh *me = ob->data;
/* Always get the vertex coordinates from the original mesh. Otherwise
* there is the risk of deforming already-deformed coordinates. */
- Mesh *mesh_orig_id = (me->id.tag & LIB_TAG_COPY_ON_WRITE) ? (Mesh *)me->id.orig_id : me;
+ Mesh *mesh_orig_id = (Mesh *)DEG_get_original_id(&me->id);
ModifierData *firstmd, *md, *previewmd = NULL;
CDMaskLink *datamasks, *curr;
/* XXX Always copying POLYINDEX, else tessellated data are no more valid! */
More information about the Bf-blender-cvs
mailing list