diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-12-21 13:50:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-12-21 13:50:32 +0300 |
| commit | 0c859f836ba0df60d19a23568c044f17807d227d (patch) | |
| tree | ad99162c1c1ad27d1bfa3a4d2472ec91290f24a2 /source | |
| parent | 1d957e4fb7a990957195b49beaad496adeba34f6 (diff) | |
Fix #20432: object.layers did not do correct update, could miss depsgraph rebuild.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 4c22316be19..b4e288e776d 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -190,9 +190,11 @@ static void rna_Object_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr) 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 @@ static void rna_Base_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr) Base *base= (Base*)ptr->id.data; Object *ob= (Object*)base->object; - ob->lay= base->lay; - rna_Object_layer_update__internal(scene, base, ob); + ob->lay= base->lay; } static int rna_Object_data_editable(PointerRNA *ptr) |