svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender...
[blender-staging.git] / source / blender / makesdna / DNA_userdef_types.h
index d8081adee616f792251a95bb1317a719bc88ac30..3a14c261fd9145b4a7edebdbce9fcc1609f8e4f6 100644 (file)
@@ -197,7 +197,7 @@ typedef struct ThemeSpace {
        char grid[4]; 
        
        char wire[4], select[4];
-       char lamp[4];
+       char lamp[4], speaker[4], pad2[4];
        char active[4], group[4], group_active[4], transform[4];
        char vertex[4], vertex_select[4];
        char edge[4], edge_select[4];
@@ -210,10 +210,13 @@ typedef struct ThemeSpace {
        char bone_solid[4], bone_pose[4];
        char strip[4], strip_select[4];
        char cframe[4];
+       
        char nurb_uline[4], nurb_vline[4];
        char act_spline[4], nurb_sel_uline[4], nurb_sel_vline[4], lastsel_point[4];
-       char handle_free[4], handle_auto[4], handle_vect[4], handle_align[4];
-       char handle_sel_free[4], handle_sel_auto[4], handle_sel_vect[4], handle_sel_align[4];
+       
+       char handle_free[4], handle_auto[4], handle_vect[4], handle_align[4], handle_auto_clamped[4];
+       char handle_sel_free[4], handle_sel_auto[4], handle_sel_vect[4], handle_sel_align[4], handle_sel_auto_clamped[4];
+       
        char ds_channel[4], ds_subchannel[4]; // dopesheet
        
        char console_output[4], console_input[4], console_info[4], console_error[4];