diff options
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 00dc1c1205e..af1dfc62894 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -284,7 +284,7 @@ typedef struct ThemeSpace { char nodeclass_pattern[4], nodeclass_layout[4]; char movie[4], movieclip[4], mask[4], image[4], scene[4], audio[4]; /* for sequence editor */ - char effect[4], transition[4], meta[4]; + char effect[4], transition[4], meta[4], text_strip[4], pad[4]; char editmesh_active[4]; char handle_vertex[4]; @@ -545,6 +545,7 @@ typedef struct UserDef { char author[80]; /* author name for file formats supporting it */ char font_path_ui[1024]; + char font_path_ui_mono[1024]; int compute_device_type; int compute_device_id; @@ -683,7 +684,6 @@ typedef enum eUserpref_UI_Flag2 { USER_KEEP_SESSION = (1 << 0), USER_REGION_OVERLAP = (1 << 1), USER_TRACKPAD_NATURAL = (1 << 2), - USER_OPENGL_NO_WARN_SUPPORT = (1 << 3) } eUserpref_UI_Flag2; /* Auto-Keying mode */ @@ -754,7 +754,7 @@ typedef enum eOpenGL_RenderingOptions { /* USER_DISABLE_SOUND = (1 << 1), */ /* deprecated, don't use without checking for */ /* backwards compatibilty in do_versions! */ USER_DISABLE_MIPMAP = (1 << 2), - USER_DISABLE_VBO = (1 << 3), + /* USER_DISABLE_VBO = (1 << 3), */ /* DEPRECATED we always use vertex buffers now */ /* USER_DISABLE_AA = (1 << 4), */ /* DEPRECATED */ } eOpenGL_RenderingOptions; @@ -802,19 +802,23 @@ typedef enum eTimecodeStyles { * with '+' to denote the frames * i.e. HH:MM:SS+FF, MM:SS+FF, SS+FF, or MM:SS */ - USER_TIMECODE_MINIMAL = 0, - + USER_TIMECODE_MINIMAL = 0, + /* reduced SMPTE - (HH:)MM:SS:FF */ - USER_TIMECODE_SMPTE_MSF = 1, - + USER_TIMECODE_SMPTE_MSF = 1, + /* full SMPTE - HH:MM:SS:FF */ - USER_TIMECODE_SMPTE_FULL = 2, - + USER_TIMECODE_SMPTE_FULL = 2, + /* milliseconds for sub-frames - HH:MM:SS.sss */ - USER_TIMECODE_MILLISECONDS = 3, - + USER_TIMECODE_MILLISECONDS = 3, + /* seconds only */ - USER_TIMECODE_SECONDS_ONLY = 4, + USER_TIMECODE_SECONDS_ONLY = 4, + + /* Private (not exposed as generic choices) options. */ + /* milliseconds for sub-frames , SubRip format- HH:MM:SS,sss */ + USER_TIMECODE_SUBRIP = 100, } eTimecodeStyles; /* theme drawtypes */ |