diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-02-15 20:37:59 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-02-15 21:29:09 +0300 |
| commit | a428daada080771c75bb2003f60792dfea5f2121 (patch) | |
| tree | 40430414b7032024e205e9f53c5e7e1c5c574cbd /source/blender/editors/space_buttons | |
| parent | 883ef2c9cef5b25fb2da9233181e07cd2555c444 (diff) | |
Layers: Separate between scene render layer (F12) and context render layer (everything else)
For now they are the same. However with workspaces they will be
different, and should be treated differently.
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 34213d3d565..3727c29d9d0 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -181,8 +181,8 @@ 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; - TODO_LAYER_CONTEXT; /* use context, not active one */ - SceneLayer *sl = BKE_scene_layer_active(scene); + + SceneLayer *sl = BKE_scene_layer_context_active(scene); ob = (sl->basact) ? sl->basact->object : NULL; if (ob) { |