[Bf-blender-cvs] [606ac3eb7f4] blender2.8: Fix modifier cage option being overwritten
Campbell Barton
noreply at git.blender.org
Wed Oct 10 06:23:06 CEST 2018
Commit: 606ac3eb7f4c93466eb666fe0ae9b6494a4e1bb6
Author: Campbell Barton
Date: Wed Oct 10 15:18:34 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB606ac3eb7f4c93466eb666fe0ae9b6494a4e1bb6
Fix modifier cage option being overwritten
Editmesh modifier calculation behaved as if eModifierMode_OnCage
was enabled for all modifiers.
Remove assignment after all modifiers are calculated.
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 21eff8d39ee..e04a5bcf0a3 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2128,13 +2128,6 @@ static void editbmesh_calc_modifiers(
}
else {
/* this is just a copy of the editmesh, no need to calc normals */
- Mesh *me_orig = ob->data;
- if (me_orig->id.tag & LIB_TAG_COPIED_ON_WRITE) {
- BKE_mesh_runtime_ensure_edit_data(me_orig);
- if (me_orig->runtime.edit_data->vertexCos != NULL)
- MEM_freeN((void *)me_orig->runtime.edit_data->vertexCos);
- me_orig->runtime.edit_data->vertexCos = MEM_dupallocN(deformedVerts);
- }
*r_final = BKE_mesh_from_editmesh_with_coords_thin_wrap(em, dataMask, deformedVerts);
deformedVerts = NULL;
More information about the Bf-blender-cvs
mailing list