1 files changed, 14 insertions, 3 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 1d787388774..54aa46d8b85 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1990,6 +1990,14 @@ static void mesh_build_extra_data(struct Depsgraph *depsgraph, Object *ob)
 	}
 }
 
+static void mesh_runtime_check_normals_valid(const Mesh *mesh)
+{
+	UNUSED_VARS_NDEBUG(mesh);
+	BLI_assert(!(mesh->runtime.cd_dirty_vert & CD_MASK_NORMAL));
+	BLI_assert(!(mesh->runtime.cd_dirty_loop & CD_MASK_NORMAL));
+	BLI_assert(!(mesh->runtime.cd_dirty_poly & CD_MASK_NORMAL));
+}
+
 static void mesh_build_data(
         struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask,
         const bool build_shapekey_layers, const bool need_mapping)
@@ -2005,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;
 
@@ -2025,8 +2037,7 @@ static void mesh_build_data(
 //		BKE_sculpt_update_mesh_elements(depsgraph, scene, scene->toolsettings->sculpt, ob, false, false);
 	}
 
-	BLI_assert(!(ob->derivedFinal->dirty & DM_DIRTY_NORMALS));
-
+	mesh_runtime_check_normals_valid(ob->runtime.mesh_eval);
 	mesh_build_extra_data(depsgraph, ob);
 }
 
@@ -2053,7 +2064,7 @@ static void editbmesh_build_data(
 
 	em->lastDataMask = dataMask;
 
-	BLI_assert(!(em->mesh_eval_final->runtime.cd_dirty_vert & DM_DIRTY_NORMALS));
+	mesh_runtime_check_normals_valid(em->mesh_eval_final);
 }
 
 static CustomDataMask object_get_datamask(const Depsgraph *depsgraph, Object *ob, bool *r_need_mapping)