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, 24 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index cb2341b0b7f..ed59014cf75 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -154,7 +154,6 @@ typedef struct uiGradientColors { char high_gradient[4]; int show_grad; int pad2; - } uiGradientColors; typedef struct ThemeUI { @@ -163,7 +162,7 @@ typedef struct ThemeUI { uiWidgetColors wcol_radio, wcol_option, wcol_toggle; uiWidgetColors wcol_num, wcol_numslider; uiWidgetColors wcol_menu, wcol_pulldown, wcol_menu_back, wcol_menu_item, wcol_tooltip; - uiWidgetColors wcol_box, wcol_scroll, wcol_progress, wcol_list_item; + uiWidgetColors wcol_box, wcol_scroll, wcol_progress, wcol_list_item, wcol_pie_menu; uiWidgetStateColors wcol_state; @@ -246,6 +245,7 @@ typedef struct ThemeSpace { char extra_edge_len[4], extra_edge_angle[4], extra_face_angle[4], extra_face_area[4]; char normal[4]; char vertex_normal[4]; + char loop_normal[4]; char bone_solid[4], bone_pose[4], bone_pose_active[4]; char strip[4], strip_select[4]; char cframe[4]; @@ -263,7 +263,7 @@ typedef struct ThemeSpace { char keyborder[4], keyborder_select[4]; char console_output[4], console_input[4], console_info[4], console_error[4]; - char console_cursor[4], console_select[4], pad1[4]; + char console_cursor[4], console_select[4]; char vertex_size, outline_width, facedot_size; char noodle_curving; @@ -328,6 +328,9 @@ typedef struct ThemeSpace { char info_warning[4], info_warning_text[4]; char info_info[4], info_info_text[4]; char info_debug[4], info_debug_text[4]; + + char paint_curve_pivot[4]; + char paint_curve_handle[4]; } ThemeSpace; @@ -489,7 +492,8 @@ typedef struct UserDef { short color_picker_type; char ipo_new; /* interpolation mode for newly added F-Curves */ char keyhandles_new; /* handle types for newly added keyframes */ - char pad1[2]; + char gpu_select_method; + char pad1; short scrcastfps; /* frame rate for screencast to be played back */ short scrcastwait; /* milliseconds between screencast snapshots */ @@ -531,6 +535,15 @@ typedef struct UserDef { float fcu_inactive_alpha; /* opacity of inactive F-Curves in F-Curve Editor */ float pixelsize; /* private, set by GHOST, to multiply DPI with */ + short pie_interaction_type; /* if keeping a pie menu spawn button pressed after this time, it turns into + * a drag/release pie menu */ + short pie_initial_timeout; /* direction in the pie menu will always be calculated from the initial position + * within this time limit */ + int pie_animation_timeout; + int pad2; + short pie_menu_radius; /* pie menu radius */ + short pie_menu_threshold; /* pie menu distance from center before a direction is set */ + struct WalkNavigation walk_navigation; } UserDef; @@ -716,6 +729,13 @@ typedef enum eOpenGL_RenderingOptions { /* USER_DISABLE_AA = (1 << 4), */ /* DEPRECATED */ } eOpenGL_RenderingOptions; +/* selection method for opengl gpu_select_method */ +typedef enum eOpenGL_SelectOptions { + USER_SELECT_AUTO = 0, + USER_SELECT_USE_OCCLUSION_QUERY = 1, + USER_SELECT_USE_SELECT_RENDERMODE = 2 +} eOpenGL_SelectOptions; + /* wm draw method */ typedef enum eWM_DrawMethod { USER_DRAW_TRIPLE = 0, |