diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2013-03-30 15:40:09 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2013-03-30 15:40:09 +0400 |
| commit | ae1028df73dc4280b033a6c3230dbb9402b15a2f (patch) | |
| tree | a26e8041370d56cee12d50b1fb30196273de0ed2 /source/blender/editors | |
| parent | cd6d337d410fcef8d9ea9a06ae4f6cffc2942b84 (diff) | |
Tidy up stroke options and make them sexy, aka the paint option
sculptification commit. We have a drop menu to select the stroke mode
now. Jitter controls appear under stroke panel under all modes (As they
should! They stroke control options). Also enable jittering for all
modes. I really fail to see why not.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_stroke.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index 83b144e314e..d5ece4830af 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -278,9 +278,7 @@ static void paint_brush_stroke_add_step(bContext *C, wmOperator *op, const wmEve paint_brush_update(C, brush, mode, stroke, mouse_in, pressure); - /* TODO: as sculpt and other paint modes are unified, this - * separation will go away */ - if (paint_supports_jitter(mode)) { + { float delta[2]; float factor = stroke->zoom_2d; @@ -298,9 +296,6 @@ static void paint_brush_stroke_add_step(bContext *C, wmOperator *op, const wmEve add_v2_v2v2(mouse_out, mouse_in, delta); } } - else { - copy_v2_v2(mouse_out, mouse_in); - } /* TODO: can remove the if statement once all modes have this */ if (stroke->get_location) @@ -525,11 +520,6 @@ bool paint_supports_dynamic_tex_coords(Brush *br, PaintMode mode) return true; } -bool paint_supports_jitter(PaintMode mode) -{ - return ELEM3(mode, PAINT_SCULPT, PAINT_TEXTURE_PROJECTIVE, PAINT_TEXTURE_2D); -} - #define PAINT_STROKE_MODAL_CANCEL 1 /* called in paint_ops.c, on each regeneration of keymaps */ |