=bmesh= merge from trunk at r36529
[blender.git] / source / blender / makesdna / DNA_userdef_types.h
index 1be67a4501b1443ded4755a8ee4c031525102375..b36ae468f6ac3c7263e6c8ad47166fbca55151db 100644 (file)
@@ -236,6 +236,9 @@ typedef struct ThemeSpace {
        char hpad[7];
        
        char preview_back[4];
+
+       char pin[4];
+       int pin_opac;
        
 } ThemeSpace;
 
@@ -389,7 +392,7 @@ typedef struct UserDef {
        struct ColorBand coba_weight;   /* from texture.h */
 
        float sculpt_paint_overlay_col[3];
-       int pad3;
+       int loopcut_finish_on_release;
 
        char author[80];        /* author name for file formats supporting it */
 } UserDef;