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:
authorWilliam Reynish <billreynish>2018-10-28 19:51:40 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-10-29 21:04:07 +0300
commitb18ac77df3c2eb002bd4c5ed2e6b606535cb67cc (patch)
tree2b8bbffc571a72172e7cdf27a432750c53ebc371 /release/scripts/startup
parentb5667c2ca7f7cc33903b7f664dfbd3bccd8cdd22 (diff)
UI: icon set updates Andrzej Ambroz, and various fixes.
* Text editor word wrap, line numbers & syntax toggles now use consistent icons that don’t change when you enable or disable them. * Replaced icon toggle buttons in the snapping popover with normal checkboxes and descriptive text labels. This makes it clearer which item is the main radio button, is more consistent with other popovers, and allows us to use more descriptive text. * Added correct icons for grease pencil add menu. * Added bespoke icons for grease pencil modifiers. * Added icon for particle instance modifier. * Added icon for fake user on & off states. * Added correct icons for enabling/disabling modifiers in the dopesheet & f-curve editor. * Made it so the restrict viewport & restrict render toggles for modifier update correctly when enabled or disabled, by flipping the order in the icon sheet. This also required changing the outliner to match. * Removed the few old remaining icons in the old style and made sure to replace the last places where they were used. * Updated many icons to be clearer & more consistent.
Diffstat (limited to 'release/scripts/startup')
-rw-r--r--release/scripts/startup/bl_ui/properties_data_mesh.py12
-rw-r--r--release/scripts/startup/bl_ui/space_dopesheet.py53
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py4
3 files changed, 36 insertions, 33 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index 687f23341fe..eb92f0f8723 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -30,9 +30,9 @@ class MESH_MT_vertex_group_specials(Menu):
layout.operator("object.vertex_group_sort", icon='SORTALPHA', text="Sort by Name").sort_type = 'NAME'
layout.operator("object.vertex_group_sort", icon='ARMATURE_DATA', text="Sort by Bone Hierarchy").sort_type = 'BONE_HIERARCHY'
- layout.operator("object.vertex_group_copy", icon='COPY_ID')
- layout.operator("object.vertex_group_copy_to_linked", icon='LINK_AREA')
- layout.operator("object.vertex_group_copy_to_selected", icon='LINK_AREA')
+ layout.operator("object.vertex_group_copy", icon='ADD')
+ layout.operator("object.vertex_group_copy_to_linked", icon='LINKED')
+ layout.operator("object.vertex_group_copy_to_selected", icon='RESTRICT_SELECT_ON')
layout.operator("object.vertex_group_mirror", icon='ARROW_LEFTRIGHT').use_topology = False
layout.operator("object.vertex_group_mirror", text="Mirror Vertex Group (Topology)", icon='ARROW_LEFTRIGHT').use_topology = True
layout.operator("object.vertex_group_remove_from", icon='X', text="Remove from All Groups").use_all_groups = True
@@ -51,12 +51,12 @@ class MESH_MT_shape_key_specials(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("object.shape_key_transfer", icon='COPY_ID') # icon is not ideal
- layout.operator("object.join_shapes", icon='COPY_ID') # icon is not ideal
+ layout.operator("object.shape_key_transfer")
+ layout.operator("object.join_shapes")
layout.operator("object.shape_key_mirror", icon='ARROW_LEFTRIGHT').use_topology = False
layout.operator("object.shape_key_mirror", text="Mirror Shape Key (Topology)", icon='ARROW_LEFTRIGHT').use_topology = True
layout.operator("object.shape_key_add", icon='ADD', text="New Shape From Mix").from_mix = True
- layout.operator("object.shape_key_remove", icon='X', text="Delete All Shapes").all = True
+ layout.operator("object.shape_key_remove", icon='REMOVE', text="Delete All Shapes").all = True
layout.operator("object.shape_key_move", icon='TRIA_UP_BAR', text="Move To Top").type = 'TOP'
layout.operator("object.shape_key_move", icon='TRIA_DOWN_BAR', text="Move To Bottom").type = 'BOTTOM'
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index e50fc4f8690..145eea66d0a 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -109,27 +109,14 @@ class DopesheetFilterPopoverBase:
def draw_standard_filters(cls, context, layout):
dopesheet = context.space_data.dopesheet
- # Object Data Filters
- layout.label(text="Include Sub-Object Data:")
- split = layout.split()
-
- # TODO: Add per-channel/axis convenience toggles?
- col = split.column()
- col.prop(dopesheet, "show_transforms", text="Transforms")
-
- col = split.column()
- col.prop(dopesheet, "show_modifiers", text="Modifiers")
-
- layout.separator()
-
# datablock filters
- layout.label(text="Include From Types:")
+ layout.label(text="Filter by Type:")
flow = layout.grid_flow(row_major=True, columns=2, even_rows=False, align=False)
flow.prop(dopesheet, "show_scenes", text="Scenes")
- flow.prop(dopesheet, "show_worlds", text="Worlds")
flow.prop(dopesheet, "show_nodes", text="Node Trees")
+ # object types
if bpy.data.armatures:
flow.prop(dopesheet, "show_armatures", text="Armatures")
if bpy.data.cameras:
@@ -138,28 +125,44 @@ class DopesheetFilterPopoverBase:
flow.prop(dopesheet, "show_gpencil", text="Grease Pencil Objects")
if bpy.data.lights:
flow.prop(dopesheet, "show_lights", text="Lights")
- if bpy.data.materials:
- flow.prop(dopesheet, "show_materials", text="Materials")
- if bpy.data.textures:
- flow.prop(dopesheet, "show_textures", text="Textures")
if bpy.data.meshes:
flow.prop(dopesheet, "show_meshes", text="Meshes")
- if bpy.data.shape_keys:
- flow.prop(dopesheet, "show_shapekeys", text="Shape Keys")
if bpy.data.curves:
flow.prop(dopesheet, "show_curves", text="Curves")
- if bpy.data.particles:
- flow.prop(dopesheet, "show_particles", text="Particles")
if bpy.data.lattices:
flow.prop(dopesheet, "show_lattices", text="Lattices")
+ if bpy.data.metaballs:
+ flow.prop(dopesheet, "show_metaballs", text="Metaballs")
+
+ # data types
+ flow.prop(dopesheet, "show_worlds", text="Worlds")
+ if bpy.data.particles:
+ flow.prop(dopesheet, "show_particles", text="Particles")
if bpy.data.linestyles:
flow.prop(dopesheet, "show_linestyles", text="Line Styles")
- if bpy.data.metaballs:
- flow.prop(dopesheet, "show_metaballs", text="Metas")
if bpy.data.speakers:
flow.prop(dopesheet, "show_speakers", text="Speakers")
+ if bpy.data.materials:
+ flow.prop(dopesheet, "show_materials", text="Materials")
+ if bpy.data.textures:
+ flow.prop(dopesheet, "show_textures", text="Textures")
+ if bpy.data.shape_keys:
+ flow.prop(dopesheet, "show_shapekeys", text="Shape Keys")
layout.separator()
+
+ # Object Data Filters
+
+ # TODO: Add per-channel/axis convenience toggles?
+ split = layout.split()
+
+ col = split.column()
+ col.prop(dopesheet, "show_transforms", text="Transforms")
+
+ col = split.column()
+ col.prop(dopesheet, "show_modifiers", text="Modifiers")
+
+ layout.separator()
# performance-related options (users will mostly have these enabled)
col = layout.column(align=True)
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 26d019a8447..4fa971b77cf 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4846,10 +4846,10 @@ class VIEW3D_PT_snapping(Panel):
if object_mode == 'EDIT':
col.prop(toolsettings, "use_snap_self")
if object_mode in {'OBJECT', 'POSE', 'EDIT'}:
- col.prop(toolsettings, "use_snap_align_rotation", text="Align Rotation")
+ col.prop(toolsettings, "use_snap_align_rotation")
if 'FACE' in snap_elements:
- col.prop(toolsettings, "use_snap_project", text="Project Elements")
+ col.prop(toolsettings, "use_snap_project")
if 'VOLUME' in snap_elements:
col.prop(toolsettings, "use_snap_peel_object")