diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2010-07-14 18:11:03 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2010-07-14 18:11:03 +0400 |
| commit | 5505697ac508c02b8a2e196c5a8c07431bc687cf (patch) | |
| tree | a550a4718d586066017e3861d42104ef09e969bf /source/blender/makesdna/DNA_color_types.h | |
| parent | ae1748b98470f08ed805e101b218f44c17d9b6b2 (diff) | |
Merge GSOC Sculpt Branch: 28499-30319
https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins
See log of that branch for details.
Diffstat (limited to 'source/blender/makesdna/DNA_color_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_color_types.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h index bc35d379334..83cd7979ce7 100644 --- a/source/blender/makesdna/DNA_color_types.h +++ b/source/blender/makesdna/DNA_color_types.h @@ -64,7 +64,8 @@ typedef struct CurveMap { typedef struct CurveMapping { int flag, cur; /* cur; for buttons, to show active curve */ - int preset, pad; + int preset; + int changed_timestamp; rctf curr, clipr; /* current rect, clip rect (is default rect too) */ @@ -87,7 +88,9 @@ typedef enum CurveMappingPreset { CURVE_PRESET_SHARP, CURVE_PRESET_SMOOTH, CURVE_PRESET_MAX, - CURVE_PRESET_MID9 + CURVE_PRESET_MID9, + CURVE_PRESET_ROUND, + CURVE_PRESET_ROOT, } CurveMappingPreset; /* histogram->mode */ |