diff options
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 14 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 3 |
2 files changed, 3 insertions, 14 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 139cb298710..5a666653043 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -448,7 +448,9 @@ typedef enum ID_Type { /* No copy-on-write for these types. * Keep in sync with check_datablocks_copy_on_writable and deg_copy_on_write_is_needed */ -#define ID_TYPE_IS_COW(_id_type) (!ELEM(_id_type, ID_BR, ID_LS, ID_PAL, ID_IM)) +/* TODO(sergey): Make Sound copyable. It is here only because the code for dependency graph is + * being work in progress. */ +#define ID_TYPE_IS_COW(_id_type) (!ELEM(_id_type, ID_BR, ID_LS, ID_PAL, ID_IM, ID_SO)) #ifdef GS # undef GS @@ -602,16 +604,6 @@ typedef enum IDRecalcFlag { */ ID_RECALC_COPY_ON_WRITE = (1 << 13), - /* Sequences in the sequencer did change. - * Use this tag with a scene ID which owns the sequences. */ - ID_RECALC_SEQUENCER_STRIPS = (1 << 14), - - ID_RECALC_AUDIO_SEEK = (1 << 15), - ID_RECALC_AUDIO_FPS = (1 << 16), - ID_RECALC_AUDIO_VOLUME = (1 << 17), - ID_RECALC_AUDIO_MUTE = (1 << 18), - ID_RECALC_AUDIO_LISTENER = (1 << 19), - /*************************************************************************** * Pseudonyms, to have more semantic meaning in the actual code without * using too much low-level and implementation specific tags. */ diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 5240de4aff9..c21fa2ba64e 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -232,9 +232,6 @@ typedef struct Sequence { int cache_flag; int _pad2[3]; - - struct Sequence *orig_sequence; - void *_pad3; } Sequence; typedef struct MetaStack { |