[Bf-blender-cvs] [231d6882198] blender2.8: Outliner: Use scene_layer from context

Dalai Felinto noreply at git.blender.org
Tue Jul 18 17:15:03 CEST 2017


Commit: 231d68821989deb9024b801690b63069f39dbd90
Author: Dalai Felinto
Date:   Tue Jul 18 17:14:43 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB231d68821989deb9024b801690b63069f39dbd90

Outliner: Use scene_layer from context

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

M	source/blender/editors/space_outliner/outliner_tree.c

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

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 568927425a9..adb019766ea 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1944,7 +1944,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SceneLayer *sl, SpaceOops
 		outliner_add_orphaned_datablocks(mainvar, soops);
 	}
 	else if (soops->outlinevis == SO_ACT_LAYER) {
-		outliner_add_collections_act_layer(soops, BKE_scene_layer_context_active_PLACEHOLDER(scene));
+		outliner_add_collections_act_layer(soops, sl);
 	}
 	else if (soops->outlinevis == SO_COLLECTIONS) {
 		outliner_add_collections_master(soops, scene);




More information about the Bf-blender-cvs mailing list