From c0d8166f828ce9c1eaf243ad27097bfcfff1820d Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 13 Jul 2016 10:39:55 +0200 Subject: Revert "Depsgraph: Russian electric tape bodge to have multiple proxies work" This reverts commit 47d0d9cca4d0c3ccbdc368e97fc24652379fd368. Reverting the commit. Not only it did not solve all the cases of proxy popping, but also broke real cases with single proxy involved. --- source/blender/blenkernel/intern/object_update.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'source/blender/blenkernel/intern/object_update.c') diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 457263f854b..5cb704e4737 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -347,10 +347,3 @@ void BKE_object_eval_uber_data(EvaluationContext *eval_ctx, ob->recalc &= ~(OB_RECALC_DATA | OB_RECALC_TIME); } - -void BKE_object_eval_proxy_backlink(EvaluationContext *UNUSED(eval_ctx), Object *ob) -{ - if (ob->proxy) { - ob->proxy->proxy_from = ob; - } -} -- cgit v1.2.3