[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51946] trunk/blender/source/blender/ blenkernel/intern/scene.c: Bugfix #32191

[Ton Roosendaal]

Revision: 51946
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51946
Author:   ton
Date:     2012-11-06 18:07:17 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
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)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/scene.c

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2012-11-06 16:41:20 UTC (rev 51945)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2012-11-06 18:07:17 UTC (rev 51946)
@@ -1019,8 +1019,10 @@
 		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... */