diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-30 17:32:49 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-30 17:32:49 +0300 |
| commit | 92e3b3839b11e66730cf53ead260fa2a4bec9118 (patch) | |
| tree | fa95dd91f046c803c4a08b50daf42ff57cb2030a /source/blender/editors/space_outliner/outliner_intern.h | |
| parent | f1f1c3284950902f7597931bd1044f085d2ef634 (diff) | |
| parent | 10a2562bc5d4c873bbe58e4aa3d19522080d1f2b (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_outliner/outliner_intern.h
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_intern.h')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index 7ca1bc9cc9b..2516453020c 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -115,7 +115,7 @@ 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, 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 */ enum { |