From 04bea047b5ada4b46f97043b451dba8bfac0b15c Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Tue, 6 Nov 2012 18:07:17 +0000 Subject: [PATCH] Bugfix #32191 Case: multiple scenes, linked objects on different layers. By definition, a layer is a local scene property - not of object. On setting scenes, this then gets copied over to objects. Error was a 2.5 year old commit to allow object layer animation, which is due to depsgraph issues badly supported anyway. (animate visibility outliner flags instead) --- source/blender/blenkernel/intern/scene.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index a1918b77a1e..c923c34a0ae 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1019,8 +1019,10 @@ static void scene_update_tagged_recursive(Main *bmain, Scene *scene, Scene *scen if (ob->dup_group && (ob->transflag & OB_DUPLIGROUP)) group_handle_recalc_and_update(scene_parent, ob, ob->dup_group); - /* always update layer, so that animating layers works */ - base->lay = ob->lay; + /* always update layer, so that animating layers works (joshua july 2010) */ + /* XXX commented out, this has depsgraph issues anyway - and this breaks setting scenes + (on scene-set, the base-lay is copied to ob-lay (ton nov 2012) */ + // base->lay = ob->lay; } /* scene drivers... */