diff options
author | Stefan Werner <stefan.werner@tangent-animation.com> | 2021-08-02 10:28:54 +0300 |
---|---|---|
committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2021-08-02 10:28:54 +0300 |
commit | 34e8d79c3edbc58fd242cec0c1f2bed4e43855af (patch) | |
tree | 36c70e63515af2bd8ea840102493028faec37971 /source/blender/makesdna/DNA_sequence_types.h | |
parent | 465fb31ed275618ec71e4925ab94bd4a9b077a12 (diff) | |
parent | 48722e8971133dbe14ecc6825a2451637df77eab (diff) |
Merge branch 'master' into cycles_texture_cache
Diffstat (limited to 'source/blender/makesdna/DNA_sequence_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 1bd4c9233e3..af524ff4866 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -43,9 +43,9 @@ extern "C" { struct Ipo; struct MovieClip; struct Scene; +struct SequenceLookup; struct VFont; struct bSound; -struct SequenceLookup; /* strlens; 256= FILE_MAXFILE, 768= FILE_MAXDIR */ @@ -201,6 +201,7 @@ typedef struct Sequence { ListBase anims; float effect_fader; + /* DEPRECATED, only used for versioning. */ float speed_fader; /* pointers for effects: */ @@ -335,12 +336,28 @@ typedef struct SolidColorVars { typedef struct SpeedControlVars { float *frameMap; + /* DEPRECATED, only used for versioning. */ float globalSpeed; + /* DEPRECATED, only used for versioning. */ int flags; + int length; int lastValidFrame; + int speed_control_type; + + float speed_fader; + float speed_fader_length; + float speed_fader_frame_number; } SpeedControlVars; +/* SpeedControlVars.speed_control_type */ +enum { + SEQ_SPEED_STRETCH = 0, + SEQ_SPEED_MULTIPLY = 1, + SEQ_SPEED_LENGTH = 2, + SEQ_SPEED_FRAME_NUMBER = 3, +}; + typedef struct GaussianBlurVars { float size_x; float size_y; @@ -485,9 +502,9 @@ typedef struct SequencerScopes { #define SEQ_EDIT_PROXY_DIR_STORAGE 1 /* SpeedControlVars->flags */ -#define SEQ_SPEED_INTEGRATE (1 << 0) +#define SEQ_SPEED_UNUSED_2 (1 << 0) /* cleared */ #define SEQ_SPEED_UNUSED_1 (1 << 1) /* cleared */ -#define SEQ_SPEED_COMPRESS_IPO_Y (1 << 2) +#define SEQ_SPEED_UNUSED_3 (1 << 2) /* cleared */ #define SEQ_SPEED_USE_INTERPOLATION (1 << 3) /* ***************** SEQUENCE ****************** */ |