diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-29 05:09:12 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-29 05:09:12 +0400 |
commit | 15ed8343437c6b304de72cd14591455da1d5b3ec (patch) | |
tree | cbe40f76668f5e8539744c4d2f8aeaa0ded72f52 /source/blender/makesdna/DNA_userdef_types.h | |
parent | 5acd5d14970c829c2873623716a67beeb6da5278 (diff) | |
parent | dd106b5c7a129e00bebe121c4da8cb90a16d48cb (diff) |
Merged changes in the trunk up to revision 51718.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c
release/datafiles/startup.blend
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 2c51a956e18..98c135fcf53 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -184,7 +184,7 @@ typedef struct ThemeSpace { /* button/tool regions */ char button[4]; char button_title[4]; - char button_text[4]; + char button_text[4]; char button_text_hi[4]; /* listview regions */ @@ -195,8 +195,8 @@ typedef struct ThemeSpace { /* float panel */ char panel[4]; - char panel_title[4]; - char panel_text[4]; + char panel_title[4]; + char panel_text[4]; char panel_text_hi[4]; char shade1[4]; @@ -303,7 +303,7 @@ typedef struct bTheme { ThemeUI tui; /* Individual Spacetypes */ - ThemeSpace tbuts; + ThemeSpace tbuts; ThemeSpace tv3d; ThemeSpace tfile; ThemeSpace tipo; @@ -317,7 +317,7 @@ typedef struct bTheme { ThemeSpace ttime; ThemeSpace tnode; ThemeSpace tlogic; - ThemeSpace tuserpref; + ThemeSpace tuserpref; ThemeSpace tconsole; ThemeSpace tclip; @@ -533,7 +533,8 @@ typedef enum eUserpref_UI_Flag { USER_SPLASH_DISABLE = (1 << 27), USER_HIDE_RECENT = (1 << 28), USER_SHOW_THUMBNAILS = (1 << 29), - USER_QUIT_PROMPT = (1 << 30) + USER_QUIT_PROMPT = (1 << 30), + USER_HIDE_SYSTEM_BOOKMARKS = (1 << 31) } eUserpref_UI_Flag; /* Auto-Keying mode */ |