diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-09-18 15:25:52 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-09-18 15:25:52 +0400 |
commit | ab518939b55810a6bf0be7a23d5f66a547299cd8 (patch) | |
tree | 026a57388126f51675b7ccc8e0b6c67e01c0b56a /release/ui | |
parent | d56e23afc08f931c6c5ef59e9822f9604b9db0c8 (diff) |
- jitter for painting (image and projection painting, others can be added)
- remove falloff setting now the curve is used.
- bugfix for airbrush & tablet, with no movement it would assume 1.0 pressure.
- rna, use the use_* prefix for brush options.
Diffstat (limited to 'release/ui')
-rw-r--r-- | release/ui/space_image.py | 22 | ||||
-rw-r--r-- | release/ui/space_view3d.py | 6 | ||||
-rw-r--r-- | release/ui/space_view3d_toolbar.py | 55 |
3 files changed, 53 insertions, 30 deletions
diff --git a/release/ui/space_image.py b/release/ui/space_image.py index 161e29194ed..50ccda34c6a 100644 --- a/release/ui/space_image.py +++ b/release/ui/space_image.py @@ -412,7 +412,7 @@ class IMAGE_PT_paint(bpy.types.Panel): row.template_list(settings, "brushes", settings, "active_brush_index", rows=2) col.template_ID(settings, "brush", new="brush.add") - + row = layout.row(align=True) row.item_enumR(settings, "tool", 'DRAW') row.item_enumR(settings, "tool", 'SOFTEN') @@ -424,12 +424,16 @@ class IMAGE_PT_paint(bpy.types.Panel): row = col.row(align=True) row.itemR(brush, "size", slider=True) - row.itemR(brush, "size_pressure", toggle=True, text="") + row.itemR(brush, "use_size_pressure", toggle=True, text="") row = col.row(align=True) row.itemR(brush, "strength", slider=True) - row.itemR(brush, "strength_pressure", toggle=True, text="") - + row.itemR(brush, "use_strength_pressure", toggle=True, text="") + + row = col.row(align=True) + row.itemR(brush, "jitter", slider=True) + row.itemR(brush, "use_jitter_pressure", toggle=True, text="") + col.itemR(brush, "blend", text="Blend") class IMAGE_PT_paint_stroke(bpy.types.Panel): @@ -448,16 +452,16 @@ class IMAGE_PT_paint_stroke(bpy.types.Panel): settings = context.tool_settings.image_paint brush = settings.brush - layout.itemR(brush, "airbrush") + layout.itemR(brush, "use_airbrush") col = layout.column() - col.active = brush.airbrush + col.active = brush.use_airbrush col.itemR(brush, "rate", slider=True) - layout.itemR(brush, "space") + layout.itemR(brush, "use_space") row = layout.row(align=True) - row.active = brush.space + row.active = brush.use_space row.itemR(brush, "spacing", text="Distance", slider=True) - row.itemR(brush, "spacing_pressure", toggle=True, text="") + row.itemR(brush, "use_spacing_pressure", toggle=True, text="") class IMAGE_PT_paint_curve(bpy.types.Panel): __space_type__ = 'IMAGE_EDITOR' diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py index 62b7fa0d91f..fd06853625e 100644 --- a/release/ui/space_view3d.py +++ b/release/ui/space_view3d.py @@ -539,16 +539,16 @@ class VIEW3D_MT_sculpt(bpy.types.Menu): layout.itemS() if brush.sculpt_tool != 'GRAB': - layout.itemR(brush, "airbrush") + layout.itemR(brush, "use_airbrush") if brush.sculpt_tool != 'LAYER': - layout.itemR(brush, "anchored") + layout.itemR(brush, "use_anchor") if brush.sculpt_tool in ('DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'): layout.itemR(brush, "flip_direction") if brush.sculpt_tool == 'LAYER': - layout.itemR(brush, "persistent") + layout.itemR(brush, "use_persistent") layout.itemO("sculpt.set_persistent_base") # ********** Particle menu ********** diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py index 09e85bf5131..6f17ad925cf 100644 --- a/release/ui/space_view3d_toolbar.py +++ b/release/ui/space_view3d_toolbar.py @@ -387,13 +387,18 @@ class VIEW3D_PT_tools_brush(PaintPanel): row = col.row(align=True) row.itemR(brush, "size", slider=True) - row.itemR(brush, "size_pressure", toggle=True, text="") + row.itemR(brush, "use_size_pressure", toggle=True, text="") if brush.sculpt_tool != 'GRAB': row = col.row(align=True) row.itemR(brush, "strength", slider=True) - row.itemR(brush, "strength_pressure", text="") - + row.itemR(brush, "use_strength_pressure", text="") + + ''' # XXX - TODO + row = col.row(align=True) + row.itemR(brush, "jitter", slider=True) + row.itemR(brush, "use_jitter_pressure", toggle=True, text="") + ''' col = layout.column() if brush.sculpt_tool in ('DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'): @@ -419,11 +424,15 @@ class VIEW3D_PT_tools_brush(PaintPanel): row = col.row(align=True) row.itemR(brush, "size", slider=True) - row.itemR(brush, "size_pressure", toggle=True, text="") + row.itemR(brush, "use_size_pressure", toggle=True, text="") row = col.row(align=True) row.itemR(brush, "strength", slider=True) - row.itemR(brush, "strength_pressure", toggle=True, text="") + row.itemR(brush, "use_strength_pressure", toggle=True, text="") + + row = col.row(align=True) + row.itemR(brush, "jitter", slider=True) + row.itemR(brush, "use_jitter_pressure", toggle=True, text="") col.itemR(brush, "blend", text="Blend") @@ -435,11 +444,15 @@ class VIEW3D_PT_tools_brush(PaintPanel): col = layout.column() row = col.row(align=True) row.itemR(brush, "size", slider=True) - row.itemR(brush, "size_pressure", toggle=True, text="") + row.itemR(brush, "use_size_pressure", toggle=True, text="") row = col.row(align=True) row.itemR(brush, "strength", slider=True) - row.itemR(brush, "strength_pressure", toggle=True, text="") + row.itemR(brush, "use_strength_pressure", toggle=True, text="") + + row = col.row(align=True) + row.itemR(brush, "jitter", slider=True) + row.itemR(brush, "use_jitter_pressure", toggle=True, text="") # Vertex Paint Mode # @@ -449,11 +462,17 @@ class VIEW3D_PT_tools_brush(PaintPanel): row = col.row(align=True) row.itemR(brush, "size", slider=True) - row.itemR(brush, "size_pressure", toggle=True, text="") + row.itemR(brush, "use_size_pressure", toggle=True, text="") row = col.row(align=True) row.itemR(brush, "strength", slider=True) - row.itemR(brush, "strength_pressure", toggle=True, text="") + row.itemR(brush, "use_strength_pressure", toggle=True, text="") + + ''' # XXX - TODO + row = col.row(align=True) + row.itemR(brush, "jitter", slider=True) + row.itemR(brush, "use_jitter_pressure", toggle=True, text="") + ''' class VIEW3D_PT_tools_brush_stroke(PaintPanel): __label__ = "Stroke" @@ -475,27 +494,27 @@ class VIEW3D_PT_tools_brush_stroke(PaintPanel): if context.sculpt_object: if brush.sculpt_tool != 'LAYER': - layout.itemR(brush, "anchored") - layout.itemR(brush, "rake") + layout.itemR(brush, "use_anchor") + layout.itemR(brush, "use_rake") - layout.itemR(brush, "airbrush") + layout.itemR(brush, "use_airbrush") col = layout.column() - col.active = brush.airbrush + col.active = brush.use_airbrush col.itemR(brush, "rate", slider=True) if not texture_paint: - layout.itemR(brush, "smooth_stroke") + layout.itemR(brush, "use_smooth_stroke") col = layout.column() - col.active = brush.smooth_stroke + col.active = brush.use_smooth_stroke col.itemR(brush, "smooth_stroke_radius", text="Radius", slider=True) col.itemR(brush, "smooth_stroke_factor", text="Factor", slider=True) - layout.itemR(brush, "space") + layout.itemR(brush, "use_space") row = layout.row(align=True) - row.active = brush.space + row.active = brush.use_space row.itemR(brush, "spacing", text="Distance", slider=True) if texture_paint: - row.itemR(brush, "spacing_pressure", toggle=True, text="") + row.itemR(brush, "use_spacing_pressure", toggle=True, text="") class VIEW3D_PT_tools_brush_curve(PaintPanel): __label__ = "Curve" |