diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-12 11:39:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-12 11:39:52 +0300 |
commit | 147c24aeeb96a8ea5128c1593a10dc3db4ce8f7e (patch) | |
tree | 4ede6957433f2eca23651aa6a43e9547b327bad9 /source/blender/makesrna/intern/rna_layer.c | |
parent | bbb2fa14c821d14cf977a9ebba2018a42b806bec (diff) |
Fix T54032: Adding torus test fails
rna_LayerObjects_active_object_update used wrong viewlayer.
Regression in 345c6298e99
Diffstat (limited to 'source/blender/makesrna/intern/rna_layer.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_layer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c index a3d570df40a..efa05ed5b92 100644 --- a/source/blender/makesrna/intern/rna_layer.c +++ b/source/blender/makesrna/intern/rna_layer.c @@ -846,8 +846,7 @@ static void rna_LayerObjects_active_object_update(struct bContext *C, PointerRNA return; } - WorkSpace *workspace = WM_window_get_active_workspace(win); - ViewLayer *view_layer = BKE_workspace_view_layer_get(workspace, scene); + ViewLayer *view_layer = (ViewLayer *)ptr->data; if (scene->obedit) { ED_object_editmode_exit(C, EM_FREEDATA); } |