diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
| commit | bb7339a7aec37bdb2ee8a21599e6c65b37ef1277 (patch) | |
| tree | 6fb8da94c6e43098c606f768e722484b04b8645c /source/blender/editors/sculpt_paint/paint_utils.c | |
| parent | 37f2c8a64c3277f100ab084ef1bb3846bc7b2c62 (diff) | |
| parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) | |
merge with trunk at r31523
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_utils.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_utils.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 9baa8e6f95e..47170dfdbdf 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -7,6 +7,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_brush_types.h" #include "RNA_access.h" #include "RNA_define.h" @@ -14,13 +15,10 @@ #include "BLI_math.h" #include "BKE_brush.h" -#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_DerivedMesh.h" -#include "BKE_global.h" #include "BKE_paint.h" -#include "BKE_utildefines.h" #include "BIF_gl.h" @@ -216,7 +214,6 @@ void BRUSH_OT_curve_preset(wmOperatorType *ot) {CURVE_PRESET_SHARP, "SHARP", 0, "Sharp", ""}, {CURVE_PRESET_SMOOTH, "SMOOTH", 0, "Smooth", ""}, {CURVE_PRESET_MAX, "MAX", 0, "Max", ""}, - {CURVE_PRESET_MID9, "MID9", 0, "Mid9", ""}, {CURVE_PRESET_LINE, "LINE", 0, "Line", ""}, {CURVE_PRESET_ROUND, "ROUND", 0, "Round", ""}, {CURVE_PRESET_ROOT, "ROOT", 0, "Root", ""}, @@ -229,7 +226,7 @@ void BRUSH_OT_curve_preset(wmOperatorType *ot) ot->exec= brush_curve_preset_exec; ot->poll= brush_curve_preset_poll; - ot->flag= OPTYPE_UNDO; + ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; RNA_def_enum(ot->srna, "shape", prop_shape_items, CURVE_PRESET_SMOOTH, "Mode", ""); } |