diff options
Diffstat (limited to 'release/scripts')
27 files changed, 148 insertions, 135 deletions
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index 52dce466800..913de92ff6d 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -887,7 +887,7 @@ class Menu(StructRNA, _GenericUI, metaclass=RNAMeta): props.menu_idname = self.bl_idname if add_operator: - props = row.operator(add_operator, text="", icon='ZOOMOUT') + props = row.operator(add_operator, text="", icon='REMOVE') props.name = name props.remove_name = True @@ -901,7 +901,7 @@ class Menu(StructRNA, _GenericUI, metaclass=RNAMeta): sub.emboss = 'NORMAL' sub.prop(wm, "preset_name", text="") - props = row.operator(add_operator, text="", icon='ZOOMIN') + props = row.operator(add_operator, text="", icon='ADD') props.name = wm.preset_name def draw_preset(self, context): diff --git a/release/scripts/modules/rna_keymap_ui.py b/release/scripts/modules/rna_keymap_ui.py index 2581d7782f1..752db7fd5ac 100644 --- a/release/scripts/modules/rna_keymap_ui.py +++ b/release/scripts/modules/rna_keymap_ui.py @@ -105,7 +105,7 @@ def draw_km(display_keymaps, kc, km, children, layout, level): subcol = _indented_layout(col, kmi_level) subcol = subcol.split(factor=0.2).column() subcol.operator("wm.keyitem_add", text="Add New", text_ctxt=i18n_contexts.id_windowmanager, - icon='ZOOMIN') + icon='ADD') col.separator() @@ -350,7 +350,7 @@ def draw_filtered(display_keymaps, filter_type, filter_text, layout): # "Add New" at end of keymap item list col = _indented_layout(layout, 1) subcol = col.split(factor=0.2).column() - subcol.operator("wm.keyitem_add", text="Add New", icon='ZOOMIN') + subcol.operator("wm.keyitem_add", text="Add New", icon='ADD') return True @@ -380,8 +380,8 @@ def draw_keymaps(context, layout): if not text: text = "Blender (default)" row.menu("USERPREF_MT_keyconfigs", text=text) - row.operator("wm.keyconfig_preset_add", text="", icon='ZOOMIN') - row.operator("wm.keyconfig_preset_add", text="", icon='ZOOMOUT').remove_active = True + row.operator("wm.keyconfig_preset_add", text="", icon='ADD') + row.operator("wm.keyconfig_preset_add", text="", icon='REMOVE').remove_active = True # layout.context_pointer_set("keyconfig", wm.keyconfigs.active) # row.operator("wm.keyconfig_remove", text="", icon='X') diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py index c987609bafa..fc17cc60c6c 100644 --- a/release/scripts/modules/rna_prop_ui.py +++ b/release/scripts/modules/rna_prop_ui.py @@ -188,7 +188,7 @@ def draw(layout, context, context_member, property_type, use_edit=True): if not is_rna: props = row.operator("wm.properties_edit", text="Edit") assign_props(props, val_draw, key) - props = row.operator("wm.properties_remove", text="", icon='ZOOMOUT') + props = row.operator("wm.properties_remove", text="", icon='REMOVE') assign_props(props, val_draw, key) else: row.label(text="API Defined") diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index 833643cdafc..376f2d9811d 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -121,8 +121,8 @@ class DATA_PT_bone_groups(ArmatureButtonsPanel, Panel): col = row.column(align=True) col.active = (ob.proxy is None) - col.operator("pose.group_add", icon='ZOOMIN', text="") - col.operator("pose.group_remove", icon='ZOOMOUT', text="") + col.operator("pose.group_add", icon='ADD', text="") + col.operator("pose.group_remove", icon='REMOVE', text="") col.menu("DATA_MT_bone_group_specials", icon='DOWNARROW_HLT', text="") if group: col.separator() @@ -187,14 +187,14 @@ class DATA_PT_pose_library(ArmatureButtonsPanel, Panel): # invoke should still be used for 'add', as it is needed to allow # add/replace options to be used properly - col.operator("poselib.pose_add", icon='ZOOMIN', text="") + col.operator("poselib.pose_add", icon='ADD', text="") col.operator_context = 'EXEC_DEFAULT' # exec not invoke, so that menu doesn't need showing pose_marker_active = poselib.pose_markers.active if pose_marker_active is not None: - col.operator("poselib.pose_remove", icon='ZOOMOUT', text="") + col.operator("poselib.pose_remove", icon='REMOVE', text="") col.operator( "poselib.apply_pose", icon='ZOOM_SELECTED', diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index 441c9724c53..7c65969e398 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -435,7 +435,7 @@ class DATA_PT_text_boxes(CurveButtonsPanelText, Panel): text = context.curve - layout.operator("font.textbox_add", icon='ZOOMIN') + layout.operator("font.textbox_add", icon='ADD') for i, box in enumerate(text.text_boxes): diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py index 8bb1c2641f2..627d9c4349f 100644 --- a/release/scripts/startup/bl_ui/properties_data_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py @@ -73,12 +73,12 @@ class GPENCIL_MT_layer_specials(Menu): def draw(self, context): layout = self.layout - layout.operator("gpencil.layer_duplicate", icon='COPY_ID') # XXX: needs a dedicated icon + layout.operator("gpencil.layer_duplicate", icon='ADD') # XXX: needs a dedicated icon layout.separator() - layout.operator("gpencil.reveal", icon='HIDE_OFF', text="Show All") - layout.operator("gpencil.hide", icon='HIDE_ON', text="Hide Others").unselected = True + layout.operator("gpencil.reveal", icon='RESTRICT_VIEW_OFF', text="Show All") + layout.operator("gpencil.hide", icon='RESTRICT_VIEW_ON', text="Hide Others").unselected = True layout.separator() @@ -87,7 +87,7 @@ class GPENCIL_MT_layer_specials(Menu): layout.separator() - layout.operator("gpencil.layer_merge", icon='NLA', text="Merge Down") + layout.operator("gpencil.layer_merge", icon='SORT_ASC', text="Merge Down") layout.separator() layout.menu("VIEW3D_MT_gpencil_copy_layer") @@ -134,8 +134,8 @@ class DATA_PT_gpencil_datapanel(Panel): col = row.column() sub = col.column(align=True) - sub.operator("gpencil.layer_add", icon='ZOOMIN', text="") - sub.operator("gpencil.layer_remove", icon='ZOOMOUT', text="") + sub.operator("gpencil.layer_add", icon='ADD', text="") + sub.operator("gpencil.layer_remove", icon='REMOVE', text="") gpl = context.active_gpencil_layer if gpl: @@ -152,7 +152,7 @@ class DATA_PT_gpencil_datapanel(Panel): sub = col.column(align=True) sub.operator("gpencil.layer_isolate", icon='LOCKED', text="").affect_visibility = False - sub.operator("gpencil.layer_isolate", icon='HIDE_OFF', text="").affect_visibility = True + sub.operator("gpencil.layer_isolate", icon='RESTRICT_VIEW_ON', text="").affect_visibility = True row = layout.row(align=True) if gpl: @@ -300,8 +300,8 @@ class DATA_PT_gpencil_vertexpanel(DataButtonsPanel, Panel): row.template_list("GPENCIL_UL_vgroups", "", ob, "vertex_groups", ob.vertex_groups, "active_index", rows=rows) col = row.column(align=True) - col.operator("object.vertex_group_add", icon='ZOOMIN', text="") - col.operator("object.vertex_group_remove", icon='ZOOMOUT', text="").all = False + col.operator("object.vertex_group_add", icon='ADD', text="") + col.operator("object.vertex_group_remove", icon='REMOVE', text="").all = False if ob.vertex_groups: row = layout.row() diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index d455b56b3f4..c23b0fdc446 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -55,7 +55,7 @@ class MESH_MT_shape_key_specials(Menu): layout.operator("object.join_shapes", icon='COPY_ID') # icon is not ideal 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='ZOOMIN', text="New Shape From Mix").from_mix = 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_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' @@ -79,7 +79,7 @@ class MESH_UL_fmaps(UIList): # assert(isinstance(item, bpy.types.FaceMap)) fmap = item if self.layout_type in {'DEFAULT', 'COMPACT'}: - layout.prop(fmap, "name", text="", emboss=False, icon_value=icon) + layout.prop(fmap, "name", text="", emboss=False, icon='FACE_MAPS') elif self.layout_type in {'GRID'}: layout.alignment = 'CENTER' layout.label(text="", icon_value=icon) @@ -109,11 +109,23 @@ class MESH_UL_shape_keys(UIList): layout.label(text="", icon_value=icon) -class MESH_UL_uvmaps_vcols(UIList): +class MESH_UL_uvmaps(UIList): def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index): # assert(isinstance(item, (bpy.types.MeshTexturePolyLayer, bpy.types.MeshLoopColorLayer))) if self.layout_type in {'DEFAULT', 'COMPACT'}: - layout.prop(item, "name", text="", emboss=False, icon_value=icon) + layout.prop(item, "name", text="", emboss=False, icon='GROUP_UVS') + icon = 'RESTRICT_RENDER_OFF' if item.active_render else 'RESTRICT_RENDER_ON' + layout.prop(item, "active_render", text="", icon=icon, emboss=False) + elif self.layout_type == 'GRID': + layout.alignment = 'CENTER' + layout.label(text="", icon_value=icon) + + +class MESH_UL_vcols(UIList): + def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index): + # assert(isinstance(item, (bpy.types.MeshTexturePolyLayer, bpy.types.MeshLoopColorLayer))) + if self.layout_type in {'DEFAULT', 'COMPACT'}: + layout.prop(item, "name", text="", emboss=False, icon='GROUP_VCOL') icon = 'RESTRICT_RENDER_OFF' if item.active_render else 'RESTRICT_RENDER_ON' layout.prop(item, "active_render", text="", icon=icon, emboss=False) elif self.layout_type == 'GRID': @@ -215,8 +227,8 @@ class DATA_PT_vertex_groups(MeshButtonsPanel, Panel): row.template_list("MESH_UL_vgroups", "", ob, "vertex_groups", ob.vertex_groups, "active_index", rows=rows) col = row.column(align=True) - col.operator("object.vertex_group_add", icon='ZOOMIN', text="") - props = col.operator("object.vertex_group_remove", icon='ZOOMOUT', text="") + col.operator("object.vertex_group_add", icon='ADD', text="") + props = col.operator("object.vertex_group_remove", icon='REMOVE', text="") props.all_unlocked = props.all = False col.menu("MESH_MT_vertex_group_specials", icon='DOWNARROW_HLT', text="") if group: @@ -262,8 +274,8 @@ class DATA_PT_face_maps(MeshButtonsPanel, Panel): row.template_list("MESH_UL_fmaps", "", ob, "face_maps", ob.face_maps, "active_index", rows=rows) col = row.column(align=True) - col.operator("object.face_map_add", icon='ZOOMIN', text="") - col.operator("object.face_map_remove", icon='ZOOMOUT', text="") + col.operator("object.face_map_add", icon='ADD', text="") + col.operator("object.face_map_remove", icon='REMOVE', text="") if facemap: col.separator() col.operator("object.face_map_move", icon='TRIA_UP', text="").direction = 'UP' @@ -315,8 +327,8 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel): col = row.column() sub = col.column(align=True) - sub.operator("object.shape_key_add", icon='ZOOMIN', text="").from_mix = False - sub.operator("object.shape_key_remove", icon='ZOOMOUT', text="").all = False + sub.operator("object.shape_key_add", icon='ADD', text="").from_mix = False + sub.operator("object.shape_key_remove", icon='REMOVE', text="").all = False sub.menu("MESH_MT_shape_key_specials", icon='DOWNARROW_HLT', text="") if kb: @@ -383,11 +395,11 @@ class DATA_PT_uv_texture(MeshButtonsPanel, Panel): row = layout.row() col = row.column() - col.template_list("MESH_UL_uvmaps_vcols", "uvmaps", me, "uv_layers", me.uv_layers, "active_index", rows=1) + col.template_list("MESH_UL_uvmaps", "uvmaps", me, "uv_layers", me.uv_layers, "active_index", rows=1) col = row.column(align=True) - col.operator("mesh.uv_texture_add", icon='ZOOMIN', text="") - col.operator("mesh.uv_texture_remove", icon='ZOOMOUT', text="") + col.operator("mesh.uv_texture_add", icon='ADD', text="") + col.operator("mesh.uv_texture_remove", icon='REMOVE', text="") class DATA_PT_vertex_colors(MeshButtonsPanel, Panel): @@ -402,11 +414,11 @@ class DATA_PT_vertex_colors(MeshButtonsPanel, Panel): row = layout.row() col = row.column() - col.template_list("MESH_UL_uvmaps_vcols", "vcols", me, "vertex_colors", me.vertex_colors, "active_index", rows=1) + col.template_list("MESH_UL_vcols", "vcols", me, "vertex_colors", me.vertex_colors, "active_index", rows=1) col = row.column(align=True) - col.operator("mesh.vertex_color_add", icon='ZOOMIN', text="") - col.operator("mesh.vertex_color_remove", icon='ZOOMOUT', text="") + col.operator("mesh.vertex_color_add", icon='ADD', text="") + col.operator("mesh.vertex_color_remove", icon='REMOVE', text="") class DATA_PT_customdata(MeshButtonsPanel, Panel): @@ -428,7 +440,7 @@ class DATA_PT_customdata(MeshButtonsPanel, Panel): if me.has_custom_normals: col.operator("mesh.customdata_custom_splitnormals_clear", icon='X') else: - col.operator("mesh.customdata_custom_splitnormals_add", icon='ZOOMIN') + col.operator("mesh.customdata_custom_splitnormals_add", icon='ADD') col = layout.column() @@ -450,7 +462,8 @@ classes = ( MESH_UL_vgroups, MESH_UL_fmaps, MESH_UL_shape_keys, - MESH_UL_uvmaps_vcols, + MESH_UL_uvmaps, + MESH_UL_vcols, DATA_PT_context_mesh, DATA_PT_vertex_groups, DATA_PT_shape_keys, diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index 66a71382770..df01a732da4 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -158,7 +158,7 @@ class VIEWLAYER_PT_freestyle(ViewLayerFreestyleButtonsPanel, Panel): row = box.row(align=True) row.prop(module, "use", text="") row.prop(module, "script", text="") - row.operator("scene.freestyle_module_open", icon='FILESEL', text="") + row.operator("scene.freestyle_module_open", icon='FILEBROWSER', text="") row.operator("scene.freestyle_module_remove", icon='X', text="") row.operator("scene.freestyle_module_move", icon='TRIA_UP', text="").direction = 'UP' row.operator("scene.freestyle_module_move", icon='TRIA_DOWN', text="").direction = 'DOWN' @@ -193,8 +193,8 @@ class VIEWLAYER_PT_freestyle_lineset(ViewLayerFreestyleEditorButtonsPanel, Panel row.template_list("VIEWLAYER_UL_linesets", "", freestyle, "linesets", freestyle.linesets, "active_index", rows=rows) sub = row.column(align=True) - sub.operator("scene.freestyle_lineset_add", icon='ZOOMIN', text="") - sub.operator("scene.freestyle_lineset_remove", icon='ZOOMOUT', text="") + sub.operator("scene.freestyle_lineset_add", icon='ADD', text="") + sub.operator("scene.freestyle_lineset_remove", icon='REMOVE', text="") sub.menu("RENDER_MT_lineset_specials", icon='DOWNARROW_HLT', text="") if lineset: sub.separator() diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 765c4091d14..af3170d4a22 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -108,7 +108,7 @@ class AnnotationDrawingToolsPanel: col.separator() sub = col.column(align=True) - sub.operator("gpencil.blank_frame_add", icon='NEW') + sub.operator("gpencil.blank_frame_add", icon='FILE_NEW') sub.operator("gpencil.active_frames_delete_all", icon='X', text="Delete Frame(s)") #sub = col.column(align=True) @@ -540,8 +540,8 @@ class GPENCIL_MT_pie_tools_more(Menu): col.operator("gpencil.paste", icon='PASTEDOWN', text="Paste") col = pie.column(align=True) - col.operator("gpencil.select_more", icon='ZOOMIN') - col.operator("gpencil.select_less", icon='ZOOMOUT') + col.operator("gpencil.select_more", icon='ADD') + col.operator("gpencil.select_less", icon='REMOVE') pie.operator("transform.mirror", icon='MOD_MIRROR') pie.operator("transform.bend", icon='MOD_SIMPLEDEFORM') @@ -746,8 +746,8 @@ class AnnotationDataPanel: col = row.column() sub = col.column(align=True) - sub.operator("gpencil.layer_add", icon='ZOOMIN', text="") - sub.operator("gpencil.layer_remove", icon='ZOOMOUT', text="") + sub.operator("gpencil.layer_add", icon='ADD', text="") + sub.operator("gpencil.layer_remove", icon='REMOVE', text="") gpl = context.active_gpencil_layer if gpl: @@ -879,7 +879,7 @@ class GPENCIL_UL_layer(UIList): gpl, "use_onion_skinning", text="", - icon='GHOST_ENABLED' if gpl.use_onion_skinning else 'GHOST_DISABLED', + icon='ONIONSKIN_ON' if gpl.use_onion_skinning else 'ONIONSKIN_OFF', emboss=False, ) subrow.active = gpd.use_onion_skinning diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py index 51f3c7d4a4a..ad78685d7ff 100644 --- a/release/scripts/startup/bl_ui/properties_mask_common.py +++ b/release/scripts/startup/bl_ui/properties_mask_common.py @@ -94,8 +94,8 @@ class MASK_PT_layers: sub = row.column(align=True) - sub.operator("mask.layer_new", icon='ZOOMIN', text="") - sub.operator("mask.layer_remove", icon='ZOOMOUT', text="") + sub.operator("mask.layer_new", icon='ADD', text="") + sub.operator("mask.layer_remove", icon='REMOVE', text="") if active_layer: sub.separator() diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index 4fa9a30dea5..17898f4f971 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -30,7 +30,7 @@ class MATERIAL_MT_specials(Menu): def draw(self, context): layout = self.layout - layout.operator("object.material_slot_copy", icon='COPY_ID') + layout.operator("object.material_slot_copy") layout.operator("material.copy", icon='COPYDOWN') layout.operator("material.paste", icon='PASTEDOWN') @@ -111,8 +111,8 @@ class EEVEE_MATERIAL_PT_context_material(MaterialButtonsPanel, Panel): row.template_list("MATERIAL_UL_matslots", "", ob, "material_slots", ob, "active_material_index", rows=rows) col = row.column(align=True) - col.operator("object.material_slot_add", icon='ZOOMIN', text="") - col.operator("object.material_slot_remove", icon='ZOOMOUT', text="") + col.operator("object.material_slot_add", icon='ADD', text="") + col.operator("object.material_slot_remove", icon='REMOVE', text="") col.menu("MATERIAL_MT_specials", icon='DOWNARROW_HLT', text="") diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py index f255e12cf9c..cdd39497db5 100644 --- a/release/scripts/startup/bl_ui/properties_material_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py @@ -29,8 +29,8 @@ class GPENCIL_MT_color_specials(Menu): def draw(self, context): layout = self.layout - layout.operator("gpencil.color_reveal", icon='HIDE_OFF', text="Show All") - layout.operator("gpencil.color_hide", icon='HIDE_ON', text="Hide Others").unselected = True + layout.operator("gpencil.color_reveal", icon='RESTRICT_VIEW_OFF', text="Show All") + layout.operator("gpencil.color_hide", icon='RESTRICT_VIEW_ON', text="Hide Others").unselected = True layout.separator() @@ -60,9 +60,9 @@ class GPENCIL_UL_matslots(UIList): row.prop(gpcolor, "lock", text="", emboss=False) row.prop(gpcolor, "hide", text="", emboss=False) if gpcolor.ghost is True: - icon = 'GHOST_DISABLED' + icon = 'ONIONSKIN_OFF' else: - icon = 'GHOST_ENABLED' + icon = 'ONIONSKIN_ON' row.prop(gpcolor, "ghost", text="", icon=icon, emboss=False) elif self.layout_type == 'GRID': @@ -114,8 +114,8 @@ class MATERIAL_PT_gpencil_slots(Panel): row.template_list("GPENCIL_UL_matslots", "", ob, "material_slots", ob, "active_material_index", rows=rows) col = row.column(align=True) - col.operator("object.material_slot_add", icon='ZOOMIN', text="") - col.operator("object.material_slot_remove", icon='ZOOMOUT', text="") + col.operator("object.material_slot_add", icon='ADD', text="") + col.operator("object.material_slot_remove", icon='REMOVE', text="") col.menu("GPENCIL_MT_color_specials", icon='DOWNARROW_HLT', text="") @@ -129,7 +129,7 @@ class MATERIAL_PT_gpencil_slots(Panel): sub = col.column(align=True) sub.operator("gpencil.color_isolate", icon='LOCKED', text="").affect_visibility = False - sub.operator("gpencil.color_isolate", icon='HIDE_OFF', text="").affect_visibility = True + sub.operator("gpencil.color_isolate", icon='RESTRICT_VIEW_ON', text="").affect_visibility = True row = layout.row() diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 2dfbf2aa153..1c1db517360 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -193,7 +193,7 @@ class OBJECT_PT_collections(ObjectButtonsPanel, Panel): row.operator("object.collection_link", text="Add to Collection") else: row.operator("object.collection_add", text="Add to Collection") - row.operator("object.collection_add", text="", icon='ZOOMIN') + row.operator("object.collection_add", text="", icon='ADD') obj_name = obj.name for collection in bpy.data.collections: diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index d70a0967bdc..74a4daaefd4 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -163,14 +163,14 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel): ob.particle_systems, "active_index", rows=2) col = row.column(align=True) - col.operator("object.particle_system_add", icon='ZOOMIN', text="") - col.operator("object.particle_system_remove", icon='ZOOMOUT', text="") + col.operator("object.particle_system_add", icon='ADD', text="") + col.operator("object.particle_system_remove", icon='REMOVE', text="") col.menu("PARTICLE_MT_specials", icon='DOWNARROW_HLT', text="") if psys is None: part = particle_get_settings(context) - layout.operator("object.particle_system_add", icon='ZOOMIN', text="New") + layout.operator("object.particle_system_add", icon='ADD', text="New") if part is None: return @@ -958,8 +958,8 @@ class PARTICLE_PT_physics_relations(ParticleButtonsPanel, Panel): col = row.column() sub = col.row() subsub = sub.column(align=True) - subsub.operator("particle.new_target", icon='ZOOMIN', text="") - subsub.operator("particle.target_remove", icon='ZOOMOUT', text="") + subsub.operator("particle.new_target", icon='ADD', text="") + subsub.operator("particle.target_remove", icon='REMOVE', text="") sub = col.row() subsub = sub.column(align=True) subsub.operator("particle.target_move_up", icon='TRIA_UP', text="") @@ -1112,8 +1112,8 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel, Panel): # boids, "active_boid_state_index", compact="True") #col = row.row() #sub = col.row(align=True) - #sub.operator("boid.state_add", icon='ZOOMIN', text="") - #sub.operator("boid.state_del", icon='ZOOMOUT', text="") + #sub.operator("boid.state_add", icon='ADD', text="") + #sub.operator("boid.state_del", icon='REMOVE', text="") #sub = row.row(align=True) #sub.operator("boid.state_move_up", icon='TRIA_UP', text="") #sub.operator("boid.state_move_down", icon='TRIA_DOWN', text="") @@ -1136,8 +1136,8 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel, Panel): col = row.column() sub = col.row() subsub = sub.column(align=True) - subsub.operator_menu_enum("boid.rule_add", "type", icon='ZOOMIN', text="") - subsub.operator("boid.rule_del", icon='ZOOMOUT', text="") + subsub.operator_menu_enum("boid.rule_add", "type", icon='ADD', text="") + subsub.operator("boid.rule_del", icon='REMOVE', text="") sub = col.row() subsub = sub.column(align=True) subsub.operator("boid.rule_move_up", icon='TRIA_UP', text="") @@ -1432,8 +1432,8 @@ class PARTICLE_PT_render_collection_use_count(ParticleButtonsPanel, Panel): col = row.column() sub = col.row() subsub = sub.column(align=True) - subsub.operator("particle.dupliob_copy", icon='ZOOMIN', text="") - subsub.operator("particle.dupliob_remove", icon='ZOOMOUT', text="") + subsub.operator("particle.dupliob_copy", icon='ADD', text="") + subsub.operator("particle.dupliob_remove", icon='REMOVE', text="") subsub.operator("particle.dupliob_move_up", icon='TRIA_UP', text="") subsub.operator("particle.dupliob_move_down", icon='TRIA_DOWN', text="") subsub.separator() diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py index ff48197b8e2..22b61cde9ef 100644 --- a/release/scripts/startup/bl_ui/properties_physics_common.py +++ b/release/scripts/startup/bl_ui/properties_physics_common.py @@ -45,7 +45,7 @@ def physics_add(self, layout, md, name, type, typeicon, toggles): row.prop(md, "show_viewport", text="") else: row.operator( - "object.modifier_add", text=name, text_ctxt=i18n_contexts.default, icon=typeicon + "object.modifier_add", text=name, text_ctxt=i18n_contexts.default, icon='BLANK1' ).type = type @@ -54,7 +54,7 @@ def physics_add_special(self, layout, data, name, addop, removeop, typeicon): if data: row.operator(removeop, text=name, text_ctxt=i18n_contexts.default, icon='X') else: - row.operator(addop, text=name, text_ctxt=i18n_contexts.default, icon=typeicon) + row.operator(addop, text=name, text_ctxt=i18n_contexts.default, icon='BLANK1') class PHYSICS_PT_add(PhysicButtonsPanel, Panel): @@ -76,7 +76,7 @@ class PHYSICS_PT_add(PhysicButtonsPanel, Panel): col = flow.column() if obj.field.type == 'NONE': - col.operator("object.forcefield_toggle", text="Force Field", icon='FORCE_FORCE') + col.operator("object.forcefield_toggle", text="Force Field", icon='BLANK1') else: col.operator("object.forcefield_toggle", text="Force Field", icon='X') @@ -132,8 +132,8 @@ def point_cache_ui(self, context, cache, enabled, cachetype): cache.point_caches, "active_index", rows=1 ) col = row.column(align=True) - col.operator("ptcache.add", icon='ZOOMIN', text="") - col.operator("ptcache.remove", icon='ZOOMOUT', text="") + col.operator("ptcache.add", icon='ADD', text="") + col.operator("ptcache.remove", icon='REMOVE', text="") if cachetype in {'PSYS', 'HAIR', 'SMOKE'}: col = layout.column() diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py index 9228c40e13b..1b06af294b7 100644 --- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py +++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py @@ -158,8 +158,8 @@ class PHYSICS_PT_dynamic_paint_settings(PhysicButtonsPanel, Panel): ) col = row.column(align=True) - col.operator("dpaint.surface_slot_add", icon='ZOOMIN', text="") - col.operator("dpaint.surface_slot_remove", icon='ZOOMOUT', text="") + col.operator("dpaint.surface_slot_add", icon='ADD', text="") + col.operator("dpaint.surface_slot_remove", icon='REMOVE', text="") layout.separator() @@ -375,21 +375,21 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel): row = layout.row() row.prop_search(surface, "output_name_a", ob.data, "vertex_colors", text="Paintmap Layer") - icons = 'ZOOMOUT' if surface.output_exists(object=ob, index=0) else 'ZOOMIN' + icons = 'REMOVE' if surface.output_exists(object=ob, index=0) else 'ADD' row.operator("dpaint.output_toggle", icon=icons, text="").output = 'A' # wet-map output. row = layout.row() row.prop_search(surface, "output_name_b", ob.data, "vertex_colors", text="Wetmap Layer") - icons = 'ZOOMOUT' if surface.output_exists(object=ob, index=1) else 'ZOOMIN' + icons = 'REMOVE' if surface.output_exists(object=ob, index=1) else 'ADD' row.operator("dpaint.output_toggle", icon=icons, text="").output = 'B' elif surface_type == 'WEIGHT': row = layout.row() row.prop_search(surface, "output_name_a", ob, "vertex_groups", text="Vertex Group") - icons = 'ZOOMOUT' if surface.output_exists(object=ob, index=0) else 'ZOOMIN' + icons = 'REMOVE' if surface.output_exists(object=ob, index=0) else 'ADD' row.operator("dpaint.output_toggle", icon=icons, text="").output = 'A' # image format outputs. diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index ec5ddf5cd65..34a21b76143 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -502,8 +502,8 @@ class RENDER_PT_stereoscopy(RenderButtonsPanel, Panel): row.template_list("RENDER_UL_renderviews", "name", rd, "views", rd.views, "active_index", rows=2) col = row.column(align=True) - col.operator("scene.render_view_add", icon='ZOOMIN', text="") - col.operator("scene.render_view_remove", icon='ZOOMOUT', text="") + col.operator("scene.render_view_add", icon='ADD', text="") + col.operator("scene.render_view_remove", icon='REMOVE', text="") row = layout.row() row.label(text="Camera Suffix:") diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 2cabefe905e..d1e01f2bae4 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -171,8 +171,8 @@ class SCENE_PT_keying_sets(SceneButtonsPanel, SceneKeyingSetsPanel, Panel): col.template_list("UI_UL_list", "keying_sets", scene, "keying_sets", scene.keying_sets, "active_index", rows=1) col = row.column(align=True) - col.operator("anim.keying_set_add", icon='ZOOMIN', text="") - col.operator("anim.keying_set_remove", icon='ZOOMOUT', text="") + col.operator("anim.keying_set_add", icon='ADD', text="") + col.operator("anim.keying_set_remove", icon='REMOVE', text="") layout.use_property_split = True layout.use_property_decorate = False # No animation. @@ -251,8 +251,8 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel, SceneKeyingSetsPanel, Panel): col.template_list("SCENE_UL_keying_set_paths", "", ks, "paths", ks.paths, "active_index", rows=1) col = row.column(align=True) - col.operator("anim.keying_set_path_add", icon='ZOOMIN', text="") - col.operator("anim.keying_set_path_remove", icon='ZOOMOUT', text="") + col.operator("anim.keying_set_path_add", icon='ADD', text="") + col.operator("anim.keying_set_path_remove", icon='REMOVE', text="") # TODO: 1) the template_any_ID needs to be fixed for the text alignment. # 2) use_property_decorate has to properly skip the non animatable properties. diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 86615f2651d..e92eade758c 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -704,8 +704,8 @@ class CLIP_PT_objects(CLIP_PT_clip_view_panel, Panel): sub = row.column(align=True) - sub.operator("clip.tracking_object_new", icon='ZOOMIN', text="") - sub.operator("clip.tracking_object_remove", icon='ZOOMOUT', text="") + sub.operator("clip.tracking_object_new", icon='ADD', text="") + sub.operator("clip.tracking_object_remove", icon='REMOVE', text="") class CLIP_PT_track(CLIP_PT_tracking_panel, Panel): @@ -1005,8 +1005,8 @@ class CLIP_PT_stabilization(CLIP_PT_reconstruction_panel, Panel): sub = row.column(align=True) - sub.operator("clip.stabilize_2d_add", icon='ZOOMIN', text="") - sub.operator("clip.stabilize_2d_remove", icon='ZOOMOUT', text="") + sub.operator("clip.stabilize_2d_add", icon='ADD', text="") + sub.operator("clip.stabilize_2d_remove", icon='REMOVE', text="") sub.menu('CLIP_MT_stabilize_2d_specials', text="", icon='DOWNARROW_HLT') @@ -1022,8 +1022,8 @@ class CLIP_PT_stabilization(CLIP_PT_reconstruction_panel, Panel): sub = row.column(align=True) - sub.operator("clip.stabilize_2d_rotation_add", icon='ZOOMIN', text="") - sub.operator("clip.stabilize_2d_rotation_remove", icon='ZOOMOUT', text="") + sub.operator("clip.stabilize_2d_rotation_add", icon='ADD', text="") + sub.operator("clip.stabilize_2d_rotation_remove", icon='REMOVE', text="") sub.menu('CLIP_MT_stabilize_2d_rotation_specials', text="", icon='DOWNARROW_HLT') diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 2f659b8d248..eb94adc1964 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -183,8 +183,8 @@ class FILEBROWSER_PT_bookmarks(Panel): rows=(2 if num_rows < 2 else 4), maxrows=10) col = row.column(align=True) - col.operator("file.bookmark_add", icon='ZOOMIN', text="") - col.operator("file.bookmark_delete", icon='ZOOMOUT', text="") + col.operator("file.bookmark_add", icon='ADD', text="") + col.operator("file.bookmark_delete", icon='REMOVE', text="") col.menu("FILEBROWSER_MT_bookmarks_specials", icon='DOWNARROW_HLT', text="") if num_rows > 1: @@ -192,7 +192,7 @@ class FILEBROWSER_PT_bookmarks(Panel): col.operator("file.bookmark_move", icon='TRIA_UP', text="").direction = 'UP' col.operator("file.bookmark_move", icon='TRIA_DOWN', text="").direction = 'DOWN' else: - layout.operator("file.bookmark_add", icon='ZOOMIN') + layout.operator("file.bookmark_add", icon='ADD') class FILEBROWSER_PT_recent_folders(Panel): diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 436cf4e4cad..0d2986afb02 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -852,8 +852,8 @@ class IMAGE_PT_render_slots(Panel): ) col = row.column(align=True) - col.operator("image.add_render_slot", icon='ZOOMIN', text="") - col.operator("image.remove_render_slot", icon='ZOOMOUT', text="") + col.operator("image.add_render_slot", icon='ADD', text="") + col.operator("image.remove_render_slot", icon='REMOVE', text="") col.separator() diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index 198e98a0624..877b81f26ae 100644 --- a/release/scripts/startup/bl_ui/space_outliner.py +++ b/release/scripts/startup/bl_ui/space_outliner.py @@ -70,8 +70,8 @@ class OUTLINER_HT_header(Header): layout.separator() row = layout.row(align=True) - row.operator("outliner.keyingset_add_selected", icon='ZOOMIN', text="") - row.operator("outliner.keyingset_remove_selected", icon='ZOOMOUT', text="") + row.operator("outliner.keyingset_add_selected", icon='ADD', text="") + row.operator("outliner.keyingset_remove_selected", icon='REMOVE', text="") if ks: row = layout.row() diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index a5227a28889..4e81bb5b393 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -822,7 +822,7 @@ class SEQUENCER_PT_input(SequencerButtonsPanel, Panel): split.label(text="Alpha:") split.prop(strip, "alpha_mode", text="") - layout.operator("sequencer.change_path", icon='FILESEL').filter_image = True + layout.operator("sequencer.change_path", icon='FILEBROWSER').filter_image = True elif seq_type == 'MOVIE': split = layout.split(factor=0.2) diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 76fcb2b4cdb..c25c3d38560 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -222,7 +222,7 @@ class TOPBAR_HT_lower_bar(Header): ) if mode == 'GPENCIL_PAINT': tool_settings = context.tool_settings - layout.prop(tool_settings, "use_gpencil_draw_onback", text="", icon='ORTHO') + layout.prop(tool_settings, "use_gpencil_draw_onback", text="", icon='XRAY') layout.prop(tool_settings, "use_gpencil_weight_data_add", text="", icon='WPAINT_HLT') layout.prop(tool_settings, "use_gpencil_additive_drawing", text="", icon='FREEZE') @@ -361,8 +361,8 @@ class TOPBAR_PT_gpencil_layers(Panel): col = row.column() sub = col.column(align=True) - sub.operator("gpencil.layer_add", icon='ZOOMIN', text="") - sub.operator("gpencil.layer_remove", icon='ZOOMOUT', text="") + sub.operator("gpencil.layer_add", icon='ADD', text="") + sub.operator("gpencil.layer_remove", icon='REMOVE', text="") gpl = context.active_gpencil_layer if gpl: @@ -411,7 +411,7 @@ class TOPBAR_MT_file(Menu): layout = self.layout layout.operator_context = 'INVOKE_AREA' - layout.menu("TOPBAR_MT_file_new", text="New", icon='FILE') + layout.menu("TOPBAR_MT_file_new", text="New", icon='FILE_NEW') layout.operator("wm.open_mainfile", text="Open...", icon='FILE_FOLDER') layout.menu("TOPBAR_MT_file_open_recent") layout.operator("wm.revert_mainfile") @@ -505,7 +505,7 @@ class TOPBAR_MT_file_new(Menu): splash_limit = 5 if use_splash: - icon = 'FILE' + icon = 'FILE_NEW' show_more = len(paths) > (splash_limit - 1) if show_more: paths = paths[:splash_limit - 2] @@ -783,7 +783,7 @@ class TOPBAR_MT_file_specials(Menu): layout = self.layout layout.operator_context = 'INVOKE_AREA' - layout.operator("wm.read_homefile", text="New", icon='FILE') + layout.operator("wm.read_homefile", text="New", icon='FILE_NEW') layout.operator("wm.open_mainfile", text="Open...", icon='FILE_FOLDER') layout.separator() diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index dc8242c477c..978212956aa 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -48,7 +48,7 @@ class USERPREF_HT_header(Header): layout.operator("wm.keyconfig_import") layout.operator("wm.keyconfig_export") elif userpref.active_section == 'ADDONS': - layout.operator("wm.addon_install", icon='FILESEL') + layout.operator("wm.addon_install", icon='FILEBROWSER') layout.operator("wm.addon_refresh", icon='FILE_REFRESH') layout.menu("USERPREF_MT_addons_online_resources") elif userpref.active_section == 'LIGHTS': @@ -663,8 +663,8 @@ class USERPREF_PT_theme(Panel): subrow = sub.row(align=True) subrow.menu("USERPREF_MT_interface_theme_presets", text=USERPREF_MT_interface_theme_presets.bl_label) - subrow.operator("wm.interface_theme_preset_add", text="", icon='ZOOMIN') - subrow.operator("wm.interface_theme_preset_add", text="", icon='ZOOMOUT').remove_active = True + subrow.operator("wm.interface_theme_preset_add", text="", icon='ADD') + subrow.operator("wm.interface_theme_preset_add", text="", icon='REMOVE').remove_active = True sub.separator() sub.prop(theme, "theme_area", expand=True) @@ -929,7 +929,7 @@ class USERPREF_PT_file(Panel): box = sub.box() row = box.row() row.label(text="Excluded Paths:") - row.operator("wm.userpref_autoexec_path_add", text="", icon='ZOOMIN', emboss=False) + row.operator("wm.userpref_autoexec_path_add", text="", icon='ADD', emboss=False) for i, path_cmp in enumerate(userpref.autoexec_paths): row = box.row() row.prop(path_cmp, "path", text="") @@ -1061,8 +1061,8 @@ class USERPREF_PT_input(Panel): subrow = sub.row(align=True) subrow.menu("USERPREF_MT_interaction_presets", text=bpy.types.USERPREF_MT_interaction_presets.bl_label) - subrow.operator("wm.interaction_preset_add", text="", icon='ZOOMIN') - subrow.operator("wm.interaction_preset_add", text="", icon='ZOOMOUT').remove_active = True + subrow.operator("wm.interaction_preset_add", text="", icon='ADD') + subrow.operator("wm.interaction_preset_add", text="", icon='REMOVE').remove_active = True sub.separator() sub.label(text="Mouse:") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 5726e359f16..cc259c4c7b9 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -125,7 +125,7 @@ class VIEW3D_HT_header(Header): trans_icon = getattr(trans_orientation, "icon", "BLANK1") trans_name = getattr(trans_orientation, "name", "Orientation") else: - trans_icon = 'VISIBLE_IPO_OFF' + trans_icon = 'OBJECT_ORIGIN' trans_name = getattr(current_orientation, "name", "Orientation") row = layout.row(align=True) @@ -265,9 +265,9 @@ class VIEW3D_HT_header(Header): row.active = (shading.type in {'WIREFRAME', 'SOLID'}) or object_mode in {'EDIT'} if shading.type == 'WIREFRAME': - row.prop(shading, "show_xray_wireframe", text="", icon='ORTHO') + row.prop(shading, "show_xray_wireframe", text="", icon='XRAY') else: - row.prop(shading, "show_xray", text="", icon='ORTHO') + row.prop(shading, "show_xray", text="", icon='XRAY') row = layout.row(align=True) row.prop(shading, "type", text="", expand=True) @@ -3110,7 +3110,7 @@ class VIEW3D_MT_edit_mesh_normals(Menu): layout.label(text="Face Strength") layout.operator("mesh.mod_weighted_strength", text="Face Select", icon='FACESEL').set = False - layout.operator("mesh.mod_weighted_strength", text="Set Strength", icon='ZOOMIN').set = True + layout.operator("mesh.mod_weighted_strength", text="Set Strength", icon='ADD').set = True class VIEW3D_MT_edit_mesh_shading(Menu): @@ -3796,7 +3796,7 @@ class VIEW3D_MT_shading_pie(Menu): pie.prop_enum(view.shading, "type", value='SOLID') if context.mode == 'POSE': - pie.prop(view.overlay, "show_bone_select", icon='ORTHO') + pie.prop(view.overlay, "show_bone_select", icon='XRAY') else: xray_active = (context.mode in 'EDIT_MESH') or \ (view.shading.type in {'SOLID', 'WIREFRAME'}) @@ -3808,9 +3808,9 @@ class VIEW3D_MT_shading_pie(Menu): sub.active = False if view.shading.type == 'WIREFRAME': - sub.prop(view.shading, "show_xray_wireframe", text="Toggle X-Ray", icon='ORTHO') + sub.prop(view.shading, "show_xray_wireframe", text="Toggle X-Ray", icon='XRAY') else: - sub.prop(view.shading, "show_xray", text="Toggle X-Ray", icon='ORTHO') + sub.prop(view.shading, "show_xray", text="Toggle X-Ray", icon='XRAY') pie.prop(view.overlay, "show_overlays", text="Toggle Overlays", icon='OVERLAY') pie.prop_enum(view.shading, "type", value='MATERIAL') @@ -3854,14 +3854,14 @@ class VIEW3D_MT_snap_pie(Menu): layout = self.layout pie = layout.menu_pie() - pie.operator("view3d.snap_cursor_to_grid", text="Cursor to Grid", icon='CURSOR') + pie.operator("view3d.snap_cursor_to_grid", text="Cursor to Grid", icon='PIVOT_CURSOR') pie.operator("view3d.snap_selected_to_grid", text="Selection to Grid", icon='RESTRICT_SELECT_OFF') - pie.operator("view3d.snap_cursor_to_selected", text="Cursor to Selected", icon='CURSOR') + pie.operator("view3d.snap_cursor_to_selected", text="Cursor to Selected", icon='PIVOT_CURSOR') pie.operator("view3d.snap_selected_to_cursor", text="Selection to Cursor", icon='RESTRICT_SELECT_OFF').use_offset = False pie.operator("view3d.snap_selected_to_cursor", text="Selection to Cursor (Keep Offset)", icon='RESTRICT_SELECT_OFF').use_offset = True pie.operator("view3d.snap_selected_to_active", text="Selection to Active", icon='RESTRICT_SELECT_OFF') - pie.operator("view3d.snap_cursor_to_center", text="Cursor to Center", icon='CURSOR') - pie.operator("view3d.snap_cursor_to_active", text="Cursor to Active", icon='CURSOR') + pie.operator("view3d.snap_cursor_to_center", text="Cursor to Center", icon='PIVOT_CURSOR') + pie.operator("view3d.snap_cursor_to_active", text="Cursor to Active", icon='PIVOT_CURSOR') class VIEW3D_MT_proportional_editing_falloff_pie(Menu): @@ -4174,7 +4174,7 @@ class VIEW3D_PT_shading_options(Panel): sub.prop(shading, "shadow_intensity", text="Shadow") sub.popover( panel="VIEW3D_PT_shading_options_shadow", - icon='SCRIPTWIN', + icon='PREFERENCES', text="" ) @@ -4190,7 +4190,7 @@ class VIEW3D_PT_shading_options(Panel): sub.prop(shading, "cavity_valley_factor") sub.popover( panel="VIEW3D_PT_shading_options_ssao", - icon='SCRIPTWIN', + icon='PREFERENCES', text="" ) @@ -4590,9 +4590,9 @@ class VIEW3D_PT_overlay_edit_mesh_normals(Panel): col.active = display_all row = col.row(align=True) - row.prop(overlay, "show_vertex_normals", text="", icon='VERTEXSEL') - row.prop(overlay, "show_split_normals", text="", icon='LOOPSEL') - row.prop(overlay, "show_face_normals", text="", icon='FACESEL') + row.prop(overlay, "show_vertex_normals", text="", icon='NORMALS_VERTEX') + row.prop(overlay, "show_split_normals", text="", icon='NORMALS_VERTEX_FACE') + row.prop(overlay, "show_face_normals", text="", icon='NORMALS_FACE') sub = row.row(align=True) sub.active = overlay.show_vertex_normals or overlay.show_face_normals or overlay.show_split_normals @@ -4867,11 +4867,11 @@ class VIEW3D_PT_transform_orientations(Panel): row = layout.row() col = row.column() col.prop(scene, "transform_orientation", expand=True) - row.operator("transform.create_orientation", text="", icon='ZOOMIN', emboss=False).use = True + row.operator("transform.create_orientation", text="", icon='ADD', emboss=False).use = True if orientation: row = layout.row(align=False) - row.prop(orientation, "name", text="") + row.prop(orientation, "name", text="", icon="OBJECT_ORIGIN") row.operator("transform.delete_orientation", text="", icon='X', emboss=False) diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 6f104370485..0dcf8d73f77 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -529,14 +529,14 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel): have_image = False sub = row.column(align=True) - sub.operator_menu_enum("paint.add_texture_paint_slot", "type", icon='ZOOMIN', text="") + sub.operator_menu_enum("paint.add_texture_paint_slot", "type", icon='ADD', text="") elif settings.mode == 'IMAGE': mesh = ob.data uv_text = mesh.uv_layers.active.name if mesh.uv_layers.active else "" layout.template_ID(settings, "canvas", new="image.new", open="image.open") if settings.missing_uvs: - layout.operator("paint.add_simple_uvs", icon='ZOOMIN', text="Add UVs") + layout.operator("paint.add_simple_uvs", icon='ADD', text="Add UVs") else: layout.menu("VIEW3D_MT_tools_projectpaint_uvlayer", text=uv_text, translate=False) have_image = settings.canvas is not None @@ -545,7 +545,7 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel): layout.separator() split = layout.split() split.label(text="UV Map Needed", icon='INFO') - split.operator("paint.add_simple_uvs", icon='ZOOMIN', text="Add Simple UVs") + split.operator("paint.add_simple_uvs", icon='ADD', text="Add Simple UVs") elif have_image: layout.separator() layout.operator("image.save_dirty", text="Save All Images", icon='FILE_TICK') |