kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

UI: fix some python errors in sculpt/paint modes when there is no brush.

Browse Source
This commit is contained in:
Brecht Van Lommel 2009-09-18 15:52:28 +00:00
parent 9435727712
commit 9787a2e55a
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
release/ui/space_image.py
View File

@ -419,22 +419,23 @@ class IMAGE_PT_paint(bpy.types.Panel):
row.item_enumR(settings, "tool", 'CLONE')
row.item_enumR(settings, "tool", 'SMEAR')
col = layout.column()
col.itemR(brush, "color", text="")
if brush:
col = layout.column()
col.itemR(brush, "color", text="")
row = col.row(align=True)
row.itemR(brush, "size", slider=True)
row.itemR(brush, "use_size_pressure", toggle=True, text="")
row = col.row(align=True)
row.itemR(brush, "strength", slider=True)
row.itemR(brush, "use_strength_pressure", toggle=True, text="")
row = col.row(align=True)
row.itemR(brush, "size", slider=True)
row.itemR(brush, "use_size_pressure", toggle=True, text="")
row = col.row(align=True)
row.itemR(brush, "strength", slider=True)
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="")
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")
col.itemR(brush, "blend", text="Blend")
class IMAGE_PT_paint_stroke(bpy.types.Panel):
__space_type__ = 'IMAGE_EDITOR'
@ -444,7 +445,8 @@ class IMAGE_PT_paint_stroke(bpy.types.Panel):
def poll(self, context):
sima = context.space_data
return sima.show_paint
settings = context.tool_settings.image_paint
return sima.show_paint and settings.brush
def draw(self, context):
layout = self.layout
@ -471,7 +473,8 @@ class IMAGE_PT_paint_curve(bpy.types.Panel):
def poll(self, context):
sima = context.space_data
return sima.show_paint
settings = context.tool_settings.image_paint
return sima.show_paint and settings.brush
def draw(self, context):
layout = self.layout

8
release/ui/space_view3d_toolbar.py
View File

@ -379,7 +379,7 @@ class VIEW3D_PT_tools_brush(PaintPanel):
# Sculpt Mode #
elif context.sculpt_object and settings.brush:
elif context.sculpt_object and brush:
col = layout.column()
col.itemS()
col.itemR(brush, "sculpt_tool", expand=True)
@ -412,7 +412,7 @@ class VIEW3D_PT_tools_brush(PaintPanel):
# Texture Paint Mode #
elif context.texture_paint_object:
elif context.texture_paint_object and brush:
col = layout.column(align=True)
col.item_enumR(settings, "tool", 'DRAW')
col.item_enumR(settings, "tool", 'SOFTEN')
@ -438,7 +438,7 @@ class VIEW3D_PT_tools_brush(PaintPanel):
# Weight Paint Mode #
elif context.weight_paint_object:
elif context.weight_paint_object and brush:
layout.itemR(context.tool_settings, "vertex_group_weight", text="Weight", slider=True)
col = layout.column()
@ -456,7 +456,7 @@ class VIEW3D_PT_tools_brush(PaintPanel):
# Vertex Paint Mode #
elif context.vertex_paint_object:
elif context.vertex_paint_object and brush:
col = layout.column()
col.itemR(brush, "color", text="")