diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-04 20:28:37 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-04 20:28:37 +0300 |
| commit | 29f90af19cb5e8284f95d25e3f9c9519c588c742 (patch) | |
| tree | e3cad187944f590e22d9d0a58f00c0d0005c0f36 /source/blender/editors/sculpt_paint | |
| parent | 8af456313ae4dd0fd29f66d87a07037a9289e091 (diff) | |
Fix: curve reset for brushes now gives proper smooth curve as default,
also moved brush curve presets code into curvemapping code.
Diffstat (limited to 'source/blender/editors/sculpt_paint')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_utils.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index b968930128a..606fae3d8bb 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -16,6 +16,7 @@ #include "BLI_math.h" #include "BKE_brush.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_DerivedMesh.h" #include "BKE_global.h" @@ -214,9 +215,9 @@ static int brush_curve_preset_poll(bContext *C) void BRUSH_OT_curve_preset(wmOperatorType *ot) { static EnumPropertyItem prop_shape_items[] = { - {BRUSH_PRESET_SHARP, "SHARP", 0, "Sharp", ""}, - {BRUSH_PRESET_SMOOTH, "SMOOTH", 0, "Smooth", ""}, - {BRUSH_PRESET_MAX, "MAX", 0, "Max", ""}, + {CURVE_PRESET_SHARP, "SHARP", 0, "Sharp", ""}, + {CURVE_PRESET_SMOOTH, "SMOOTH", 0, "Smooth", ""}, + {CURVE_PRESET_MAX, "MAX", 0, "Max", ""}, {0, NULL, 0, NULL, NULL}}; ot->name= "Preset"; @@ -228,7 +229,7 @@ void BRUSH_OT_curve_preset(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "shape", prop_shape_items, BRUSH_PRESET_SHARP, "Mode", ""); + RNA_def_enum(ot->srna, "shape", prop_shape_items, CURVE_PRESET_SMOOTH, "Mode", ""); } |