[Bf-blender-cvs] [a50f87d4b61] soc-2020-outliner: Disable camera and scene toggle

[Nathan Craddock]

Commit: a50f87d4b61b84bd01d23b198e888f64eefb2ffd
Author: Nathan Craddock
Date:   Wed Jun 17 20:51:13 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rBa50f87d4b61b84bd01d23b198e888f64eefb2ffd

Disable camera and scene toggle

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

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

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

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 91315b096cb..1a8850f34d8 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1940,7 +1940,7 @@ static void outliner_draw_left_column_activation(const bContext *C,
                                                  TreeStoreElem *tselem)
 {
   uiBut *but;
-
+#ifdef OL_SCENE_CAMERA_TOGGLE
   if (tselem->type == 0 && te->idcode == ID_OB) {
     Object *ob = (Object *)tselem->id;
 
@@ -1990,7 +1990,8 @@ static void outliner_draw_left_column_activation(const bContext *C,
       UI_but_func_set(but, outliner_data_activate_fn, tselem, NULL);
     }
   }
-  else if (outliner_is_collection_tree_element(te)) {
+#endif
+  if (outliner_is_collection_tree_element(te)) {
     Collection *active_collection = CTX_data_layer_collection(C)->collection;
 
     const bool is_active_collection = active_collection ==