[Bf-blender-cvs] [fd926f00586] blender2.8: Modifier stack: Only ensure derived mesh when USE_DERIVEDMESH is defined

[Sergey Sharybin]

Commit: fd926f005868858c6740de0835b2bbaf7a86318c
Author: Sergey Sharybin
Date:   Tue Nov 20 11:39:48 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBfd926f005868858c6740de0835b2bbaf7a86318c

Modifier stack: Only ensure derived mesh when USE_DERIVEDMESH is defined

This is more an internal transition away from derived mesh.

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

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

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

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 0fc1270ff0b..3d3a876f0e6 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2013,15 +2013,19 @@ static void mesh_build_data(
 
 	mesh_finalize_eval(ob);
 
+#ifdef USE_DERIVEDMESH
 	/* TODO(campbell): remove these copies, they are expected in various places over the code. */
 	ob->derivedDeform = CDDM_from_mesh_ex(ob->runtime.mesh_deform_eval, CD_REFERENCE, CD_MASK_MESH);
 	ob->derivedFinal = CDDM_from_mesh_ex(ob->runtime.mesh_eval, CD_REFERENCE, CD_MASK_MESH);
+#endif
 
 	BKE_object_boundbox_calc_from_mesh(ob, ob->runtime.mesh_eval);
 	BKE_mesh_texspace_copy_from_object(ob->runtime.mesh_eval, ob);
 
+#ifdef USE_DERIVEDMESH
 	ob->derivedFinal->needsFree = 0;
 	ob->derivedDeform->needsFree = 0;
+#endif
 	ob->lastDataMask = dataMask;
 	ob->lastNeedMapping = need_mapping;