[Bf-blender-cvs] [147c24aeeb9] blender2.8: Fix T54032: Adding torus test fails

[Campbell Barton]

Commit: 147c24aeeb96a8ea5128c1593a10dc3db4ce8f7e
Author: Campbell Barton
Date:   Mon Feb 12 19:39:52 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB147c24aeeb96a8ea5128c1593a10dc3db4ce8f7e

Fix T54032: Adding torus test fails

rna_LayerObjects_active_object_update used wrong viewlayer.

Regression in 345c6298e99

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

M	source/blender/makesrna/intern/rna_layer.c

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

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);
 	}