diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-09 14:02:01 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-09 14:02:01 +0400 |
| commit | 3717a4a9e1ef159ce9b75738cd40122bbd01671b (patch) | |
| tree | aaa8c6affd659e4809156c58d82a16ff1ece359b /source/blender/makesdna | |
| parent | dbc9227a3247e2138f964b1687e3467f3f4b9741 (diff) | |
| parent | f025b7b51159cf3cdf49e9ec0eeaf4427010e1f7 (diff) | |
Merging r42482 through r42532 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 4f6c7e22f5e..851d4b562e6 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -408,7 +408,9 @@ typedef struct UserDef { struct ColorBand coba_weight; /* from texture.h */ float sculpt_paint_overlay_col[3]; - int pad3; + + short tweak_threshold; + short pad3; char author[80]; /* author name for file formats supporting it */ } UserDef; |