Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-02-15 20:37:59 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-02-15 21:29:09 +0300
commita428daada080771c75bb2003f60792dfea5f2121 (patch)
tree40430414b7032024e205e9f53c5e7e1c5c574cbd /source/blender/editors/space_outliner/outliner_tree.c
parent883ef2c9cef5b25fb2da9233181e07cd2555c444 (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_outliner/outliner_tree.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 1ba33970aad..bbabb9e2d7a 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1849,7 +1849,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SceneLayer *sl, SpaceOops
outliner_add_orphaned_datablocks(mainvar, soops);
}
else if (soops->outlinevis == SO_COLLECTIONS) {
- outliner_add_collections(soops, BLI_findlink(&scene->render_layers, scene->active_layer), scene);
+ outliner_add_collections(soops, BKE_scene_layer_context_active(scene), scene);
}
else {
ten = outliner_add_element(soops, &soops->tree, OBACT_NEW, NULL, 0, 0);