[Bf-blender-cvs] [bf93316] master: Fix assert in outliner regarding WM and SCR ID types...
Bastien Montagne
noreply at git.blender.org
Mon May 18 13:03:47 CEST 2015
Commit: bf93316c5260af54c7aa504952011810e42ab579
Author: Bastien Montagne
Date: Mon May 18 12:53:06 2015 +0200
Branches: master
https://developer.blender.org/rBbf93316c5260af54c7aa504952011810e42ab579
Fix assert in outliner regarding WM and SCR ID types...
===================================================================
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 38672ef..24842d2 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -59,7 +59,8 @@ 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_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_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)) /* Only in 'blendfile' mode ... :/ */
/* TreeElement->flag */
#define TE_ACTIVE 1
More information about the Bf-blender-cvs
mailing list