diff options
author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
---|---|---|
committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
commit | 2658a3c1b44717f497f187a38000c804eb37bbba (patch) | |
tree | ee55c673feabced8b6ec8bf9a8aa4d82a3cda3db /release/scripts/startup/bl_ui/space_view3d_toolbar.py | |
parent | 4005cb1c6a63a217df0e887c741beee2c1359301 (diff) | |
parent | 09b859d03f0ee138c4273ef8460e91d9888387a1 (diff) |
Merge branch 'master' into soc-2013-sketch_meshsoc-2013-sketch_mesh
Conflicts:
release/scripts/addons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d_toolbar.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index cd3c238fe86..bdf7b8ea137 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -19,9 +19,11 @@ # <pep8 compliant> import bpy from bpy.types import Menu, Panel -from bl_ui.properties_paint_common import UnifiedPaintPanel -from bl_ui.properties_paint_common import brush_texture_settings -from bl_ui.properties_paint_common import brush_mask_texture_settings +from bl_ui.properties_paint_common import ( + UnifiedPaintPanel, + brush_texture_settings, + brush_mask_texture_settings, + ) class View3DPanel(): @@ -88,7 +90,7 @@ class VIEW3D_PT_tools_objectmode(View3DPanel, Panel): col = layout.column(align=True) col.label(text="Object:") - col.operator("object.duplicate_move") + col.operator("object.duplicate_move", text="Duplicate") col.operator("object.delete") col.operator("object.join") @@ -986,6 +988,8 @@ class VIEW3D_PT_sculpt_topology(Panel, View3DPaintPanel): toolsettings = context.tool_settings sculpt = toolsettings.sculpt + settings = self.paint_settings(context) + brush = settings.brush if context.sculpt_object.use_dynamic_topology_sculpting: layout.operator("sculpt.dynamic_topology_toggle", icon='X', text="Disable Dynamic") @@ -994,9 +998,12 @@ class VIEW3D_PT_sculpt_topology(Panel, View3DPaintPanel): col = layout.column() col.active = context.sculpt_object.use_dynamic_topology_sculpting - col.prop(sculpt, "detail_size") + sub = col.column(align=True) + sub.active = brush and brush.sculpt_tool not in ('MASK') + sub.prop(sculpt, "detail_size") + sub.prop(sculpt, "detail_refine_method", text="") + col.separator() col.prop(sculpt, "use_smooth_shading") - col.prop(sculpt, "use_edge_collapse") col.operator("sculpt.optimize") col.separator() col.prop(sculpt, "symmetrize_direction") |