diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-07-26 04:37:09 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-07-26 04:37:09 +0300 |
| commit | 41b8fe9e9e6d2d494473771a213a3ecba3b5e5cd (patch) | |
| tree | bce41c59d9ebda688aa2233ba03c6a9a6760b12b /source/blender/makesdna/DNA_scene_types.h | |
| parent | ab1c7a717d0afa75e5c218641a8f068c6baf4465 (diff) | |
| parent | d9cc3ea2c6e8cfd17612c35a82050cb01d8070ec (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 2208a92c635..4b0381826ec 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1304,7 +1304,9 @@ typedef struct CurvePaintSettings { char flag; char depth_mode; char surface_plane; - int error_threshold; + char fit_method; + char pad; + short error_threshold; float radius_min, radius_max; float radius_taper_start, radius_taper_end; float surface_offset; @@ -1319,6 +1321,12 @@ enum { CURVE_PAINT_FLAG_DEPTH_STROKE_OFFSET_ABS = (1 << 3), }; +/* CurvePaintSettings.fit_method */ +enum { + CURVE_PAINT_FIT_METHOD_REFIT = 0, + CURVE_PAINT_FIT_METHOD_SPLIT = 1, +}; + /* CurvePaintSettings.depth_mode */ enum { CURVE_PAINT_PROJECT_CURSOR = 0, |