[Bf-blender-cvs] [1e89a26] master: Outliner: Fix assert failure with palette ID
Sergey Sharybin
noreply at git.blender.org
Fri Sep 23 14:50:10 CEST 2016
Commit: 1e89a261b2482bdc1579fa730b3a00beda5fffad
Author: Sergey Sharybin
Date: Fri Sep 23 14:49:55 2016 +0200
Branches: master
https://developer.blender.org/rB1e89a261b2482bdc1579fa730b3a00beda5fffad
Outliner: Fix assert failure with palette ID
===================================================================
M source/blender/editors/space_outliner/outliner_intern.h
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index ca037cb..a1663dd 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -62,7 +62,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) || \
- ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF)) /* Only in 'blendfile' mode ... :/ */
+ ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF, ID_PAL)) /* Only in 'blendfile' mode ... :/ */
/* TreeElement->flag */
#define TE_ACTIVE 1
More information about the Bf-blender-cvs
mailing list