[Bf-blender-cvs] [7fd44e2498e] blender2.8: Reverted copying mesh->runtime.deformed_only in CDDM_from_mesh_ex

[Sybren A. Stüvel]

Commit: 7fd44e2498eeaeb4402162050b36fe86f7e22d2f
Author: Sybren A. Stüvel
Date:   Wed May 16 13:06:54 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7fd44e2498eeaeb4402162050b36fe86f7e22d2f

Reverted copying mesh->runtime.deformed_only in CDDM_from_mesh_ex

Doing that copy is the right thing, but only if the mesh has its own
deformed_only flag set correctly. This isn't generally the case, so
keeping dm->deformedOnly = 1 is better.

===================================================================

M	source/blender/blenkernel/intern/cdderivedmesh.c

===================================================================

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index e585c4ca666..b77582b7ec3 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -608,7 +608,10 @@ DerivedMesh *CDDM_from_mesh_ex(Mesh *mesh, int alloctype)
 	DM_init(dm, DM_TYPE_CDDM, mesh->totvert, mesh->totedge, 0 /* mesh->totface */,
 	        mesh->totloop, mesh->totpoly);
 
-	dm->deformedOnly = mesh->runtime.deformed_only;
+	/* This should actually be dm->deformedOnly = mesh->runtime.deformed_only,
+	 * but only if the original mesh had its deformed_only flag correctly set
+	 * (which isn't generally the case). */
+	dm->deformedOnly = 1;
 	dm->cd_flag = mesh->cd_flag;
 
 	if (mesh->runtime.cd_dirty_vert & CD_MASK_NORMAL) {