Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2009-07-26 12:53:23 +0400
committerThomas Dinges <blender@dingto.org>2009-07-26 12:53:23 +0400
commit3e5f46ebf963cfda0f698a9f0c047ce4df77b79f (patch)
treee81b422b2e339c0f86567991b78beca93c8141a2 /release
parenta934773475182feeddc4dd208dc5222975d9206a (diff)
2.5 Various fixes:
* Small code and layout cleanup in 3DView Side Panels. * Added missing redraw notifier for changing world datablock and cursor location.
Diffstat (limited to 'release')
-rw-r--r--release/ui/space_view3d.py5
-rw-r--r--release/ui/space_view3d_toolbar.py14
2 files changed, 8 insertions, 11 deletions
diff --git a/release/ui/space_view3d.py b/release/ui/space_view3d.py
index 0d1a8fd7bc5..fc550982afa 100644
--- a/release/ui/space_view3d.py
+++ b/release/ui/space_view3d.py
@@ -187,13 +187,14 @@ class VIEW3D_PT_background_image(bpy.types.Panel):
if bg:
layout.active = view.display_background_image
- split = layout.split()
- col = split.column()
+ col = layout.column()
col.itemR(bg, "image", text="")
#col.itemR(bg, "image_user")
col.itemR(bg, "size")
col.itemR(bg, "transparency", slider=True)
col.itemL(text="Offset:")
+
+ col = layout.column(align=True)
col.itemR(bg, "x_offset", text="X")
col.itemR(bg, "y_offset", text="Y")
diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py
index acc2590132e..0a9b1090f9e 100644
--- a/release/ui/space_view3d_toolbar.py
+++ b/release/ui/space_view3d_toolbar.py
@@ -319,9 +319,10 @@ class VIEW3D_PT_tools_brush(PaintPanel):
return self.paint_settings(context)
def draw(self, context):
+ layout = self.layout
+
settings = self.paint_settings(context)
brush = settings.brush
- layout = self.layout
if context.particle_edit_object:
layout.column().itemR(settings, "tool", expand=True)
@@ -340,10 +341,8 @@ class VIEW3D_PT_tools_brush(PaintPanel):
col.item_enumR(settings, "tool", "CLONE")
else:
col.item_enumR(settings, "tool", "SMEAR")
-
- split = layout.split()
- col = split.column()
+ col = layout.column()
row = col.row(align=True)
row.itemR(brush, "size", slider=True)
row.itemR(brush, "size_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
@@ -368,8 +367,7 @@ class VIEW3D_PT_tools_brush(PaintPanel):
rowsub.itemR(brush, "spacing", text="Spacing", slider=True)
rowsub.itemR(brush, "spacing_pressure", toggle=True, icon='ICON_BRUSH_DATA', text="")
- split = layout.split()
- col = split.column()
+ col = layout.column()
col.itemR(brush, "airbrush")
col.itemR(brush, "anchored")
col.itemR(brush, "rake")
@@ -386,8 +384,7 @@ class VIEW3D_PT_tools_brush_curve(PaintPanel):
brush = settings.brush
layout = self.layout
- split = layout.split()
- split.template_curve_mapping(brush.curve)
+ layout.template_curve_mapping(brush.curve)
class VIEW3D_PT_sculpt_options(PaintPanel):
__label__ = "Options"
@@ -537,4 +534,3 @@ bpy.types.register(VIEW3D_PT_vertex_paint_options)
bpy.types.register(VIEW3D_PT_weight_paint_options)
bpy.types.register(VIEW3D_PT_tools_texture_paint)
bpy.types.register(VIEW3D_PT_tools_particle_edit)
-