diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-05-19 16:47:47 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-05-19 16:51:09 +0300 |
| commit | b90ad0ded7d3fdcd52131122b53765bac59890cd (patch) | |
| tree | 4c53f72e3a58bb800d82b91450e438b54c1c51c6 /source/blender/makesdna/DNA_outliner_types.h | |
| parent | 3af8f52752b015d11b879e2c7a57882a662855c0 (diff) | |
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.
Diffstat (limited to 'source/blender/makesdna/DNA_outliner_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_outliner_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 |