From 47be4e9a337931f38e7b3ef903df3592ed239b0d Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 11 Jan 2019 23:13:29 +0100 Subject: Fix T60401: Shape key's from pointer being set to evaluated CoW ID. Not sure exactly why this happened for 'apply as shape' and not in other cases (did not took time to fully trace what happens there). But in any case, `BKE_key_evaluate_object_ex()` can be called from a fair amount of places, including during depsgraph evaluation, so setting back key's owner here is plain wrong in CoW era. --- source/blender/blenkernel/intern/key.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'source/blender/blenkernel/intern/key.c') diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index dce748e3ea3..85903e1dfe6 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -1333,9 +1333,6 @@ float *BKE_key_evaluate_object_ex( out = (char *)arr; } - /* prevent python from screwing this up? anyhoo, the from pointer could be dropped */ - key->from = (ID *)ob->data; - if (ob->shapeflag & OB_SHAPE_LOCK) { /* shape locked, copy the locked shape instead of blending */ KeyBlock *kb = BLI_findlink(&key->block, ob->shapenr - 1); -- cgit v1.2.3