From b90ad0ded7d3fdcd52131122b53765bac59890cd Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 19 May 2017 15:47:47 +0200 Subject: Remove redundant workaround for removing collections in outliner Collections are now identified by their pointer. Also had to correct TSE_IS_REAL_ID to fix undefined behavior on undo. --- source/blender/makesdna/DNA_outliner_types.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/makesdna/DNA_outliner_types.h') diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h index cb868ceb98e..81575beaac8 100644 --- a/source/blender/makesdna/DNA_outliner_types.h +++ b/source/blender/makesdna/DNA_outliner_types.h @@ -111,7 +111,8 @@ enum { (!ELEM((_tse)->type, TSE_NLA, TSE_NLA_TRACK, TSE_DRIVER_BASE, \ TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP, \ TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM, \ - TSE_KEYMAP, TSE_KEYMAP_ITEM, TSE_ID_BASE, TSE_GP_LAYER)) + TSE_KEYMAP, TSE_KEYMAP_ITEM, TSE_ID_BASE, TSE_GP_LAYER, \ + TSE_SCENE_COLLECTION, TSE_LAYER_COLLECTION)) #endif -- cgit v1.2.3