Merging r39717 through r39983 from trunk into soc-2011-tomato
[blender.git] / source / blender / makesdna / DNA_userdef_types.h
index 43dc532..1ced05e 100644 (file)
@@ -236,6 +236,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];
@@ -283,6 +288,7 @@ typedef struct bTheme {
        ThemeSpace tlogic;
        ThemeSpace tuserpref;   
        ThemeSpace tconsole;
+       ThemeSpace tclip;
        
        /* 20 sets of bone colors for this theme */
        ThemeWireColor tarm[20];