Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-06-19 19:23:26 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-06-19 19:25:30 +0300
commit5372da0121508057626ea60e8604c6a096c79e2b (patch)
tree64f367305a79aecae78d1768e9783740ba858117 /source/blender/blenkernel/intern/DerivedMesh.c
parent5b227c420b003672b2d4616f1b796e6ad6806708 (diff)
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...
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
-rw-r--r--source/blender/blenkernel/intern/DerivedMesh.c2
1 files changed, 1 insertions, 1 deletions
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) {