diff options
Diffstat (limited to 'source/blender/makesdna/DNA_sequence_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 850b906af39..e21f3e1e706 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -68,6 +68,9 @@ typedef struct StripCrop { typedef struct StripTransform { int xofs; int yofs; + float scale_x; + float scale_y; + float rotation; } StripTransform; typedef struct StripColorBalance { @@ -76,24 +79,24 @@ typedef struct StripColorBalance { float gain[3]; int flag; char _pad[4]; - // float exposure; - // float saturation; + /* float exposure; */ + /* float saturation; */ } StripColorBalance; typedef struct StripProxy { - char dir[768]; // custom directory for index and proxy files - // (defaults to BL_proxy) + char dir[768]; /* custom directory for index and proxy files */ + /* (defaults to BL_proxy) */ - char file[256]; // custom file - struct anim *anim; // custom proxy anim file + char file[256]; /* custom file */ + struct anim *anim; /* custom proxy anim file */ - short tc; // time code in use + short tc; /* time code in use */ - short quality; // proxy build quality - short build_size_flags; // size flags (see below) of all proxies - // to build - short build_tc_flags; // time code flags (see below) of all tc indices - // to build + short quality; /* proxy build quality */ + short build_size_flags; /* size flags (see below) of all proxies */ + /* to build */ + short build_tc_flags; /* time code flags (see below) of all tc indices */ + /* to build */ short build_flags; char storage; char _pad[5]; @@ -338,17 +341,19 @@ typedef struct TextVars { VFont *text_font; int text_blf_id; int text_size; - float color[4], shadow_color[4]; + float color[4], shadow_color[4], box_color[4]; float loc[2]; float wrap_width; + float box_margin; char flag; char align, align_y; - char _pad[1]; + char _pad[5]; } TextVars; /* TextVars.flag */ enum { SEQ_TEXT_SHADOW = (1 << 0), + SEQ_TEXT_BOX = (1 << 1), }; /* TextVars.align */ @@ -494,8 +499,8 @@ enum { SEQ_MAKE_FLOAT = (1 << 13), SEQ_LOCK = (1 << 14), SEQ_USE_PROXY = (1 << 15), - SEQ_USE_TRANSFORM = (1 << 16), - SEQ_USE_CROP = (1 << 17), + SEQ_FLAG_UNUSED_23 = (1 << 16), /* cleared */ + SEQ_FLAG_UNUSED_22 = (1 << 17), /* cleared */ SEQ_FLAG_UNUSED_18 = (1 << 18), /* cleared */ SEQ_FLAG_UNUSED_19 = (1 << 19), /* cleared */ SEQ_FLAG_UNUSED_21 = (1 << 21), /* cleared */ |