[Bf-blender-cvs] [0bf5db9040e] soc-2020-outliner: Merge branch 'master' into soc-2020-outliner

[Nathan Craddock]

Commit: 0bf5db9040e00a80d46000516524d58d520d858c
Author: Nathan Craddock
Date:   Fri Jun 19 13:05:12 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB0bf5db9040e00a80d46000516524d58d520d858c

Merge branch 'master' into soc-2020-outliner

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



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

diff --cc source/blender/editors/space_outliner/outliner_intern.h
index 874c5232339,dae8f8a91ce..dcc5fbb8671
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@@ -223,7 -223,8 +223,7 @@@ typedef enum TreeItemSelectAction 
    OL_ITEM_ACTIVATE = (1 << 2),    /* Activate the item */
    OL_ITEM_EXTEND = (1 << 3),      /* Extend the current selection */
    OL_ITEM_RECURSIVE = (1 << 4),   /* Select recursively */
- } TreeItemSelect;
 -  OL_ITEM_TOGGLE_MODE = (1 << 5)  /* Temporary */
+ } TreeItemSelectAction;
  
  /* outliner_tree.c ----------------------------------------------- */