[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25498] trunk/blender/source/blender/ makesrna/intern/rna_object.c: Fix #20432: object. layers did not do correct update, could miss depsgraph rebuild.

[Brecht Van Lommel]

Revision: 25498
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25498
Author:   blendix
Date:     2009-12-21 11:50:32 +0100 (Mon, 21 Dec 2009)

Log Message:
-----------
Fix #20432: object.layers did not do correct update, could miss depsgraph rebuild.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_object.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2009-12-21 10:46:14 UTC (rev 25497)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2009-12-21 10:50:32 UTC (rev 25498)
@@ -190,9 +190,11 @@
 	base= object_in_scene(ob, scene);
 	if(!base)
 		return;
+	
+	SWAP(int, base->lay, ob->lay);
 
-	base->lay= ob->lay;
 	rna_Object_layer_update__internal(scene, base, ob);
+	ob->lay= base->lay;
 }
 
 static void rna_Base_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr)
@@ -200,9 +202,8 @@
 	Base *base= (Base*)ptr->id.data;
 	Object *ob= (Object*)base->object;
 
+	rna_Object_layer_update__internal(scene, base, ob);
 	ob->lay= base->lay;
-
-	rna_Object_layer_update__internal(scene, base, ob);
 }
 
 static int rna_Object_data_editable(PointerRNA *ptr)