diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d_toolbar.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 55 |
1 files changed, 25 insertions, 30 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index f253801f431..bc33d3b7773 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -43,7 +43,7 @@ def draw_repeat_tools(context, layout): def draw_keyframing_tools(context, layout): col = layout.column(align=True) col.label(text="Keyframes:") - row = col.row() + row = col.row(align=True) row.operator("anim.keyframe_insert_menu", text="Insert") row.operator("anim.keyframe_delete_v3d", text="Remove") @@ -54,15 +54,15 @@ def draw_gpencil_tools(context, layout): col.label(text="Grease Pencil:") - row = col.row() + row = col.row(align=True) row.operator("gpencil.draw", text="Draw").mode = 'DRAW' row.operator("gpencil.draw", text="Line").mode = 'DRAW_STRAIGHT' - row = col.row() + row = col.row(align=True) row.operator("gpencil.draw", text="Poly").mode = 'DRAW_POLY' row.operator("gpencil.draw", text="Erase").mode = 'ERASER' - row = col.row() + row = col.row(align=True) row.prop(context.tool_settings, "use_grease_pencil_sessions") col.operator("view3d.ruler") @@ -112,7 +112,6 @@ class VIEW3D_PT_tools_objectmode(View3DPanel, Panel): draw_repeat_tools(context, layout) draw_gpencil_tools(context, layout) - col = layout.column(align=True) class VIEW3D_PT_tools_rigidbody(View3DPanel, Panel): @@ -125,10 +124,10 @@ class VIEW3D_PT_tools_rigidbody(View3DPanel, Panel): col = layout.column(align=True) col.label(text="Add/Remove:") - row = col.row() + row = col.row(align=True) row.operator("rigidbody.objects_add", text="Add Active").type = 'ACTIVE' row.operator("rigidbody.objects_add", text="Add Passive").type = 'PASSIVE' - row = col.row() + row = col.row(align=True) row.operator("rigidbody.objects_remove", text="Remove") col = layout.column(align=True) @@ -234,7 +233,7 @@ class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel): col = layout.column(align=True) col.prop(mesh, "use_mirror_x") - row = col.row() + row = col.row(align=True) row.active = ob.data.use_mirror_x row.prop(mesh, "use_mirror_topology") @@ -280,10 +279,10 @@ class VIEW3D_PT_tools_curveedit(View3DPanel, Panel): col = layout.column(align=True) col.label(text="Handles:") - row = col.row() + row = col.row(align=True) row.operator("curve.handle_type_set", text="Auto").type = 'AUTOMATIC' row.operator("curve.handle_type_set", text="Vector").type = 'VECTOR' - row = col.row() + row = col.row(align=True) row.operator("curve.handle_type_set", text="Align").type = 'ALIGNED' row.operator("curve.handle_type_set", text="Free").type = 'FREE_ALIGN' @@ -462,14 +461,14 @@ class VIEW3D_PT_tools_posemode(View3DPanel, Panel): col = layout.column(align=True) col.label(text="In-Between:") - row = col.row() + row = col.row(align=True) row.operator("pose.push", text="Push") row.operator("pose.relax", text="Relax") col.operator("pose.breakdown", text="Breakdowner") col = layout.column(align=True) col.label(text="Pose:") - row = col.row() + row = col.row(align=True) row.operator("pose.copy", text="Copy") row.operator("pose.paste", text="Paste") @@ -608,8 +607,8 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): # use_original_normal and sculpt_plane if capabilities.has_sculpt_plane: - row = col.row(align=True) col.separator() + row = col.row(align=True) if brush.use_original_normal: row.prop(brush, "use_original_normal", toggle=True, text="", icon='LOCKED') @@ -675,13 +674,13 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): col = layout.column(align=True) col.label(text="Overlay:") - row = col.row() + row = col.row(align=True) if brush.use_cursor_overlay: row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') else: row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') - sub = row.row() + sub = row.row(align=True) sub.prop(brush, "cursor_overlay_alpha", text="Alpha") sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') @@ -702,8 +701,6 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): self.prop_unified_strength(row, context, brush, "strength", text="Strength") self.prop_unified_strength(row, context, brush, "use_pressure_strength") - row = col.row(align=True) - col.prop(brush, "blend", text="Blend") col = layout.column() @@ -713,13 +710,13 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): col = layout.column(align=True) col.label(text="Overlay:") - row = col.row() + row = col.row(align=True) if brush.use_cursor_overlay: row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') else: row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') - sub = row.row() + sub = row.row(align=True) sub.prop(brush, "cursor_overlay_alpha", text="Alpha") sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') @@ -739,8 +736,6 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): self.prop_unified_strength(row, context, brush, "strength", text="Strength") self.prop_unified_strength(row, context, brush, "use_pressure_strength") - row = col.row(align=True) - col.prop(brush, "vertex_tool", text="Blend") col = layout.column() @@ -771,13 +766,13 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): col = layout.column(align=True) col.label(text="Overlay:") - row = col.row() + row = col.row(align=True) if brush.use_cursor_overlay: row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') else: row.prop(brush, "use_cursor_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') - sub = row.row() + sub = row.row(align=True) sub.prop(brush, "cursor_overlay_alpha", text="Alpha") sub.prop(brush, "use_cursor_overlay_override", toggle=True, text="", icon='BRUSH_DATA') @@ -810,14 +805,14 @@ class VIEW3D_PT_tools_brush_texture(Panel, View3DPaintPanel): col.active = brush.brush_capabilities.has_overlay col.label(text="Overlay:") - row = col.row() + row = col.row(align=True) if tex_slot.map_mode != 'STENCIL': if brush.use_primary_overlay: row.prop(brush, "use_primary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') else: row.prop(brush, "use_primary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') - sub = row.row() + sub = row.row(align=True) sub.prop(brush, "texture_overlay_alpha", text="Alpha") sub.prop(brush, "use_primary_overlay_override", toggle=True, text="", icon='BRUSH_DATA') @@ -848,14 +843,14 @@ class VIEW3D_PT_tools_mask_texture(View3DPanel, Panel): col.active = brush.brush_capabilities.has_overlay col.label(text="Overlay:") - row = col.row() + row = col.row(align=True) if tex_slot_alpha.map_mode != 'STENCIL': if brush.use_secondary_overlay: row.prop(brush, "use_secondary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF') else: row.prop(brush, "use_secondary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON') - sub = row.row() + sub = row.row(align=True) sub.prop(brush, "mask_overlay_alpha", text="Alpha") sub.prop(brush, "use_secondary_overlay_override", toggle=True, text="", icon='BRUSH_DATA') @@ -1051,7 +1046,7 @@ class VIEW3D_PT_sculpt_symmetry(Panel, View3DPaintPanel): col = layout.column(align=True) col.label(text="Mirror:") - row = col.row() + row = col.row(align=True) row.prop(sculpt, "use_symmetry_x", text="X", toggle=True) row.prop(sculpt, "use_symmetry_y", text="Y", toggle=True) row.prop(sculpt, "use_symmetry_z", text="Z", toggle=True) @@ -1333,7 +1328,7 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, Panel): if pe.is_hair: col.active = pe.is_editable col.prop(pe, "use_emitter_deflect", text="Deflect emitter") - sub = col.row() + sub = col.row(align=True) sub.active = pe.use_emitter_deflect sub.prop(pe, "emitter_distance", text="Distance") @@ -1357,7 +1352,7 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, Panel): if pe.type == 'PARTICLES': col.prop(pe, "show_particles", text="Particles") col.prop(pe, "use_fade_time") - sub = col.row() + sub = col.row(align=True) sub.active = pe.use_fade_time sub.prop(pe, "fade_frames", slider=True) |