diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-17 06:49:31 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-17 06:49:31 +0400 |
commit | 9d2d3a8be7c3c0b101e7f0f33bb1a04c69deaf67 (patch) | |
tree | 93345dd6c9c76d3c3052573d45e7230918a197a8 /release | |
parent | 1e0fd0d4c14824e856424000e1122dcb1c8b44dd (diff) |
2.5 Paint:
* Converted vertex paint and weight paint to use the new Paint type
Diffstat (limited to 'release')
-rw-r--r-- | release/ui/space_view3d_toolbar.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py index f945a422b54..9afcfbb7bdd 100644 --- a/release/ui/space_view3d_toolbar.py +++ b/release/ui/space_view3d_toolbar.py @@ -292,10 +292,11 @@ class VIEW3D_PT_tools_brush(PaintPanel): settings = self.paint_settings(context) brush = settings.brush + paint = context.sculpt_object or context.vertex_paint_object if not context.particle_edit_object: col = layout.split().column() - if context.sculpt_object: + if paint: row = col.row() row.template_list(settings, "brushes", settings, "active_brush_index", rows=2) @@ -303,10 +304,11 @@ class VIEW3D_PT_tools_brush(PaintPanel): sub_col.itemO("paint.brush_slot_add", icon="ICON_ZOOMIN", text="") sub_col.itemO("paint.brush_slot_remove", icon="ICON_ZOOMOUT", text="") - col.template_ID(settings, "brush") - - if(context.sculpt_object): - col.item_menu_enumO("brush.new", "sculpt_tool"); + if context.sculpt_object: + col.template_ID(settings, "brush") + col.item_menu_enumO("sculpt.brush_add", "sculpt_tool"); + else: + col.template_ID(settings, "brush", new="brush.add") # Particle Mode # |