diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2016-08-07 21:46:05 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2016-08-07 21:58:26 +0300 |
commit | e635f0413d85ccf636d6abbfc3ed708fb7d68390 (patch) | |
tree | 94e2d0db0e5b04d23535d67b6ef074ff52402157 /source/blender/editors | |
parent | a58fe05c05dfc2a5d63a3d1977bcb15f7778990f (diff) |
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)
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/object/object_relations.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 52fc07f3867..d5c7632765f 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; |