[Bf-blender-cvs] [8ff7f14c76] blender2.8: Temporary fix for object panel

[Dalai Felinto]

Commit: 8ff7f14c76df2cd2d214e3b5f8078a213a262a6b
Author: Dalai Felinto
Date:   Thu Feb 9 14:30:35 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB8ff7f14c76df2cd2d214e3b5f8078a213a262a6b

Temporary fix for object panel

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

M	source/blender/editors/space_buttons/buttons_context.c

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

diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 8106e0cfdd..f53d98a1b5 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -181,7 +181,9 @@ static int buttons_context_path_object(ButsContextPath *path)
 	/* if we have a scene, use the scene's active object */
 	else if (buttons_context_path_scene(path)) {
 		scene = path->ptr[path->len - 1].data;
-		ob = (scene->basact) ? scene->basact->object : NULL;
+		TODO_LAYER_CONTEXT; /* use context, not active one */
+		SceneLayer *sl = BKE_scene_layer_active(scene);
+		ob = (sl->basact) ? sl->basact->object : NULL;
 
 		if (ob) {
 			RNA_id_pointer_create(&ob->id, &path->ptr[path->len]);