diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-15 20:04:59 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-15 20:04:59 +0400 |
| commit | deb95ddb448ee9e7a4971d65ed8e7d17172e9a4d (patch) | |
| tree | aeb569a5fd07e1668c89f30847d52d8aba97b27c /source/blender/makesdna | |
| parent | 535aee820b22385051e5ec12f39883735dfef694 (diff) | |
| parent | 6ccc605660ea0b45b723016e82b3635f8d5cc707 (diff) | |
Merging r42621 through r42647 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index ce01f100239..ca2b7e0b2a9 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -309,7 +309,8 @@ typedef struct SpeedControlVars { #define SEQ_PROXY_TC_RECORD_RUN 1 #define SEQ_PROXY_TC_FREE_RUN 2 #define SEQ_PROXY_TC_INTERP_REC_DATE_FREE_RUN 4 -#define SEQ_PROXY_TC_ALL 7 +#define SEQ_PROXY_TC_RECORD_RUN_NO_GAPS 8 +#define SEQ_PROXY_TC_ALL 15 /* seq->type WATCH IT: SEQ_EFFECT BIT is used to determine if this is an effect strip!!! */ #define SEQ_IMAGE 0 diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 8f7db2a570f..5d060f152aa 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -494,6 +494,7 @@ typedef struct ColorMapping { #define MTEX_BUMP_OBJECTSPACE 1024 #define MTEX_BUMP_TEXTURESPACE 2048 /* #define MTEX_BUMP_FLIPPED 4096 */ /* UNUSED */ +#define MTEX_BICUBIC_BUMP 8192 /* blendtype */ #define MTEX_BLEND 0 |