[Bf-blender-cvs] [e0a561be1f8] blender2.8: UI: move snap & pet options into the topbar
Campbell Barton
noreply at git.blender.org
Sat May 12 19:14:25 CEST 2018
Commit: e0a561be1f83e94ea976166cf4ff6d5ecd16f990
Author: Campbell Barton
Date: Sat May 12 19:13:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe0a561be1f83e94ea976166cf4ff6d5ecd16f990
UI: move snap & pet options into the topbar
See: T55038
===================================================================
M release/scripts/startup/bl_ui/space_topbar.py
M release/scripts/startup/bl_ui/space_view3d.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index a0a4aae7dbb..995d8bbcc99 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -195,9 +195,82 @@ class TOPBAR_HT_lower_bar(Header):
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".particlemode", category="")
# 3D View Options, tsk. maybe users aren't always using 3D view?
+ toolsettings = context.tool_settings
scene = context.scene
+ obj = context.active_object
+
+ if obj:
+ # Set above:
+ # mode = obj.mode
+
+ # Proportional editing
+ if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
+ row = layout.row(align=True)
+ row.prop(toolsettings, "proportional_edit", icon_only=True)
+ if toolsettings.proportional_edit != 'DISABLED':
+ row.prop(toolsettings, "proportional_edit_falloff", icon_only=True)
+ elif mode in {'EDIT', 'PARTICLE_EDIT'}:
+ row = layout.row(align=True)
+ row.prop(toolsettings, "proportional_edit", icon_only=True)
+ if toolsettings.proportional_edit != 'DISABLED':
+ row.prop(toolsettings, "proportional_edit_falloff", icon_only=True)
+ elif mode == 'OBJECT':
+ row = layout.row(align=True)
+ row.prop(toolsettings, "use_proportional_edit_objects", icon_only=True)
+ if toolsettings.use_proportional_edit_objects:
+ row.prop(toolsettings, "proportional_edit_falloff", icon_only=True)
+ else:
+ # Proportional editing
+ if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
+ row = layout.row(align=True)
+ row.prop(toolsettings, "proportional_edit", icon_only=True)
+ if toolsettings.proportional_edit != 'DISABLED':
+ row.prop(toolsettings, "proportional_edit_falloff", icon_only=True)
+
+ # Snap
+ show_snap = False
+ if obj is None:
+ show_snap = True
+ else:
+ if mode not in {'SCULPT', 'VERTEX_PAINT', 'WEIGHT_PAINT', 'TEXTURE_PAINT'}:
+ show_snap = True
+ else:
+ paint_settings = UnifiedPaintPanel.paint_settings(context)
+ if paint_settings:
+ brush = paint_settings.brush
+ if brush and brush.stroke_method == 'CURVE':
+ show_snap = True
+
+ if show_snap:
+ snap_element = toolsettings.snap_element
+ row = layout.row(align=True)
+ row.prop(toolsettings, "use_snap", text="")
+ row.prop(toolsettings, "snap_element", icon_only=True)
+ if snap_element == 'INCREMENT':
+ row.prop(toolsettings, "use_snap_grid_absolute", text="")
+ else:
+ row.prop(toolsettings, "snap_target", text="")
+ if obj:
+ if mode == 'EDIT':
+ row.prop(toolsettings, "use_snap_self", text="")
+ if mode in {'OBJECT', 'POSE', 'EDIT'} and snap_element != 'VOLUME':
+ row.prop(toolsettings, "use_snap_align_rotation", text="")
+
+ if snap_element == 'VOLUME':
+ row.prop(toolsettings, "use_snap_peel_object", text="")
+ elif snap_element == 'FACE':
+ row.prop(toolsettings, "use_snap_project", text="")
+
+ # AutoMerge editing
+ if obj:
+ if (mode == 'EDIT' and obj.type == 'MESH'):
+ layout.prop(toolsettings, "use_mesh_automerge", text="", icon='AUTOMERGE_ON')
+
+
layout.prop(scene, "transform_orientation", text="")
+
+
# Command Settings (redo)
op = context.active_operator
row = layout.row()
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 910081ed863..ef57215741b 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -73,69 +73,6 @@ class VIEW3D_HT_header(Header):
(mode in {'WEIGHT_PAINT', 'VERTEX_PAINT'})):
row.prop(view, "use_occlude_geometry", text="")
- # Proportional editing
- if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
- row = layout.row(align=True)
- row.prop(toolsettings, "proportional_edit", icon_only=True)
- if toolsettings.proportional_edit != 'DISABLED':
- row.prop(toolsettings, "proportional_edit_falloff", icon_only=True)
- elif mode in {'EDIT', 'PARTICLE_EDIT'}:
- row = layout.row(align=True)
- row.prop(toolsettings, "proportional_edit", icon_only=True)
- if toolsettings.proportional_edit != 'DISABLED':
- row.prop(toolsettings, "proportional_edit_falloff", icon_only=True)
- elif mode == 'OBJECT':
- row = layout.row(align=True)
- row.prop(toolsettings, "use_proportional_edit_objects", icon_only=True)
- if toolsettings.use_proportional_edit_objects:
- row.prop(toolsettings, "proportional_edit_falloff", icon_only=True)
- else:
- # Proportional editing
- if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
- row = layout.row(align=True)
- row.prop(toolsettings, "proportional_edit", icon_only=True)
- if toolsettings.proportional_edit != 'DISABLED':
- row.prop(toolsettings, "proportional_edit_falloff", icon_only=True)
-
- # Snap
- show_snap = False
- if obj is None:
- show_snap = True
- else:
- if mode not in {'SCULPT', 'VERTEX_PAINT', 'WEIGHT_PAINT', 'TEXTURE_PAINT'}:
- show_snap = True
- else:
- paint_settings = UnifiedPaintPanel.paint_settings(context)
- if paint_settings:
- brush = paint_settings.brush
- if brush and brush.stroke_method == 'CURVE':
- show_snap = True
-
- if show_snap:
- snap_element = toolsettings.snap_element
- row = layout.row(align=True)
- row.prop(toolsettings, "use_snap", text="")
- row.prop(toolsettings, "snap_element", icon_only=True)
- if snap_element == 'INCREMENT':
- row.prop(toolsettings, "use_snap_grid_absolute", text="")
- else:
- row.prop(toolsettings, "snap_target", text="")
- if obj:
- if mode == 'EDIT':
- row.prop(toolsettings, "use_snap_self", text="")
- if mode in {'OBJECT', 'POSE', 'EDIT'} and snap_element != 'VOLUME':
- row.prop(toolsettings, "use_snap_align_rotation", text="")
-
- if snap_element == 'VOLUME':
- row.prop(toolsettings, "use_snap_peel_object", text="")
- elif snap_element == 'FACE':
- row.prop(toolsettings, "use_snap_project", text="")
-
- # AutoMerge editing
- if obj:
- if (mode == 'EDIT' and obj.type == 'MESH'):
- layout.prop(toolsettings, "use_mesh_automerge", text="", icon='AUTOMERGE_ON')
-
# Pose
if obj and mode == 'POSE':
row = layout.row(align=True)
More information about the Bf-blender-cvs
mailing list