[Bf-blender-cvs] [92e3b3839b1] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 92e3b3839b11e66730cf53ead260fa2a4bec9118
Author: Bastien Montagne
Date:   Wed May 30 16:32:49 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB92e3b3839b11e66730cf53ead260fa2a4bec9118

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/editors/space_outliner/outliner_intern.h

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



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

diff --cc source/blender/editors/space_outliner/outliner_intern.h
index 7ca1bc9cc9b,b9e1cc46bd6..2516453020c
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@@ -114,19 -61,14 +114,19 @@@ typedef struct TreeElement 
  
  #define TREESTORE_ID_TYPE(_id) \
  	(ELEM(GS((_id)->name), ID_SCE, ID_LI, ID_OB, ID_ME, ID_CU, ID_MB, ID_NT, ID_MA, ID_TE, ID_IM, ID_LT, ID_LA, ID_CA) || \
 -	 ELEM(GS((_id)->name), ID_KE, ID_WO, ID_SPK, ID_GR, ID_AR, ID_AC, ID_BR, ID_PA, ID_GD, ID_LS) || \
 -	 ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF, ID_PAL, ID_MC))  /* Only in 'blendfile' mode ... :/ */
 +	 ELEM(GS((_id)->name), ID_KE, ID_WO, ID_SPK, ID_GR, ID_AR, ID_AC, ID_BR, ID_PA, ID_GD, ID_LS, ID_LP) || \
- 	 ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF, ID_PAL, ID_WS))  /* Only in 'blendfile' mode ... :/ */
++	 ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF, ID_PAL, ID_MC, ID_WS))  /* Only in 'blendfile' mode ... :/ */
  
  /* TreeElement->flag */
 -#define TE_ACTIVE       1
 -#define TE_ICONROW      2
 -#define TE_LAZY_CLOSED  4
 -#define TE_FREE_NAME    8
 +enum {
 +	TE_ACTIVE      = (1 << 0),
 +	/* Closed items display their children as icon within the row. TE_ICONROW is for
 +	 * these child-items that are visible but only within the row of the closed parent. */
 +	TE_ICONROW     = (1 << 1),
 +	TE_LAZY_CLOSED = (1 << 2),
 +	TE_FREE_NAME   = (1 << 3),
 +	TE_DISABLED    = (1 << 4),
 +};
  
  /* button events */
  #define OL_NAMEBUTTON       1