[Bf-blender-cvs] [335e030753b] blender2.8: mesh_get_eval_final() should check ob->runtime.mesh_eval

[Sybren A. Stüvel]

Commit: 335e030753b5b02611ec81bfb3c3550820706fb3
Author: Sybren A. Stüvel
Date:   Fri Jun 8 15:42:27 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB335e030753b5b02611ec81bfb3c3550820706fb3

mesh_get_eval_final() should check ob->runtime.mesh_eval

It has nothing to do with ob->derivedFinal, which it checked before.

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

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

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

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 24fee9e815d..c081bb0799f 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -3138,7 +3138,7 @@ Mesh *mesh_get_eval_final(
 	bool need_mapping;
 	dataMask |= object_get_datamask(depsgraph, ob, &need_mapping);
 
-	if (!ob->derivedFinal ||
+	if (!ob->runtime.mesh_eval ||
 	    ((dataMask & ob->lastDataMask) != dataMask) ||
 	    (need_mapping != ob->lastNeedMapping))
 	{