[Bf-blender-cvs] [5372da01215] blender2.8: ModStack: Fix broken object_get_datamask helper.

[Bastien Montagne]

Commit: 5372da0121508057626ea60e8604c6a096c79e2b
Author: Bastien Montagne
Date:   Tue Jun 19 18:23:26 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5372da0121508057626ea60e8604c6a096c79e2b

ModStack: Fix broken object_get_datamask helper.

Would compare evaluated ob pointer to original one...

Found while investigating some errors in incomming cleanup, but this was
probably generating lost of other issues in some cases...

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

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

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

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index ebf19a99e58..889b3f681e6 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -3055,7 +3055,7 @@ static void editbmesh_build_data(
 static CustomDataMask object_get_datamask(const Depsgraph *depsgraph, Object *ob, bool *r_need_mapping)
 {
 	ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph);
-	Object *actob = view_layer->basact ? view_layer->basact->object : NULL;
+	Object *actob = view_layer->basact ? DEG_get_original_object(view_layer->basact->object) : NULL;
 	CustomDataMask mask = ob->customdata_mask;
 
 	if (r_need_mapping) {