diff options
author | Miika Hamalainen <blender@miikah.org> | 2011-11-07 20:36:49 +0400 |
---|---|---|
committer | Miika Hamalainen <blender@miikah.org> | 2011-11-07 20:36:49 +0400 |
commit | edec46b0a6aac18f406991b9e16228d4bd848c61 (patch) | |
tree | 1240768d737c63705fdb38c9832d926ed0bcda94 /source/blender/makesdna/DNA_userdef_types.h | |
parent | 2ed6f077b3952123d56916980d18a379ecb3e5ac (diff) | |
parent | 4d7a9e5c055fd3903162b61fdd40fb77b2b96793 (diff) |
Merge with trunk r41625
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index f54c83d6612..76d52d5b6d4 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -234,6 +234,11 @@ typedef struct ThemeSpace { char handle_vertex_select[4]; char handle_vertex_size; + + char marker_outline[4], marker[4], act_marker[4], sel_marker[4], dis_marker[4], lock_marker[4]; + char bundle_solid[4]; + char path_before[4], path_after[4]; + char camera_path[4]; char hpad[7]; char preview_back[4]; @@ -279,6 +284,7 @@ typedef struct bTheme { ThemeSpace tlogic; ThemeSpace tuserpref; ThemeSpace tconsole; + ThemeSpace tclip; /* 20 sets of bone colors for this theme */ ThemeWireColor tarm[20]; |