diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-29 19:01:55 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-29 19:01:55 +0400 |
| commit | 5bac37f6d4d2e8d584ae0ec6bafd2808c47fbb25 (patch) | |
| tree | c6f16b98555fc721099cfa99b20b0b3c8992b528 /source/blender/makesdna | |
| parent | 296cc41b03b18fbe65357aa0cfdf43f43c881922 (diff) | |
* Reverting Titlecard commit r37537
* Reverting update recent files commit r37155
* Turning reference counts into unsigned ints
* Minor things
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 11 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 359ef8449e9..93cbb643334 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -227,14 +227,6 @@ typedef struct SolidColorVars { float pad; } SolidColorVars; -typedef struct TitleCardVars { - char titlestr[64]; - char subtitle[128]; - - float fgcol[3]; - float bgcol[3]; -} TitleCardVars; - typedef struct SpeedControlVars { float * frameMap; float globalSpeed; @@ -328,8 +320,7 @@ typedef struct SpeedControlVars { #define SEQ_SPEED 29 #define SEQ_MULTICAM 30 #define SEQ_ADJUSTMENT 31 -#define SEQ_TITLECARD 40 -#define SEQ_EFFECT_MAX 40 +#define SEQ_EFFECT_MAX 31 #define STRIPELEM_FAILED 0 #define STRIPELEM_OK 1 diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index e211a7c33c1..43dc532d4f6 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -442,7 +442,6 @@ extern UserDef U; /* from blenkernel blender.c */ #define USER_NONEGFRAMES (1 << 24) #define USER_TXT_TABSTOSPACES_DISABLE (1 << 25) #define USER_TOOLTIPS_PYTHON (1 << 26) -#define USER_NO_RECENTLOAD_UPDATE (1 << 27) /* helper macro for checking frame clamping */ #define FRAMENUMBER_MIN_CLAMP(cfra) \ |