[Bf-blender-cvs] [e635f04] master: Fix local view editing broken after changing object's layer from non-local view

[Julian Eisel]

Commit: e635f0413d85ccf636d6abbfc3ed708fb7d68390
Author: Julian Eisel
Date:   Sun Aug 7 20:46:05 2016 +0200
Branches: master
https://developer.blender.org/rBe635f0413d85ccf636d6abbfc3ed708fb7d68390

Fix local view editing broken after changing object's layer from non-local view

Wasn't copying back local view bytes to object after changing layer.

Steps to reproduce were:
* Split 3D view in default startup.blend
* Enter local view in one of the 3D views
* Move default cube to different layer *in the other 3D view* (the one that's not in local view)
* Try transforming object from 3D View that's in local view (should lag)

===================================================================

M	source/blender/editors/object/object_relations.c

===================================================================

diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 52fc07f..d5c7632 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1382,7 +1382,7 @@ static int move_to_layer_exec(bContext *C, wmOperator *op)
 			/* upper byte is used for local view */
 			local = base->lay & 0xFF000000;
 			base->lay = lay + local;
-			base->object->lay = lay;
+			base->object->lay = base->lay;
 			/* if (base->object->type == OB_LAMP) is_lamp = true; */
 		}
 		CTX_DATA_END;