Skip to content

Commit

Permalink
Pose mode, autoname needs unique icons #2512
Browse files Browse the repository at this point in the history
  • Loading branch information
ReinerBforartists committed Jun 25, 2021
1 parent f3d0444 commit aeb4417
Show file tree
Hide file tree
Showing 11 changed files with 95 additions and 38 deletions.
63 changes: 60 additions & 3 deletions release/datafiles/blender_icons.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added release/datafiles/blender_icons16/icon16_rename_x.dat
View file
Binary file not shown.
Binary file added release/datafiles/blender_icons16/icon16_rename_y.dat
View file
Binary file not shown.
Binary file added release/datafiles/blender_icons16/icon16_rename_z.dat
View file
Binary file not shown.
Binary file added release/datafiles/blender_icons32/icon32_rename_x.dat
View file
Binary file not shown.
Binary file added release/datafiles/blender_icons32/icon32_rename_y.dat
View file
Binary file not shown.
Binary file added release/datafiles/blender_icons32/icon32_rename_z.dat
View file
Binary file not shown.
46 changes: 23 additions & 23 deletions release/scripts/startup/bl_ui/space_toolsystem_toolbar_tabs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4886,9 +4886,9 @@ def draw(self, _context):
col.scale_y = 2

col.operator_context = 'EXEC_REGION_WIN'
col.operator("armature.autoside_names", text="Auto-Name Left/Right", icon = "STRING").type = 'XAXIS'
col.operator("armature.autoside_names", text="Auto-Name Front/Back", icon = "STRING").type = 'YAXIS'
col.operator("armature.autoside_names", text="Auto-Name Top/Bottom", icon = "STRING").type = 'ZAXIS'
col.operator("armature.autoside_names", text="Auto-Name Left/Right", icon = "RENAME_X").type = 'XAXIS'
col.operator("armature.autoside_names", text="Auto-Name Front/Back", icon = "RENAME_Y").type = 'YAXIS'
col.operator("armature.autoside_names", text="Auto-Name Top/Bottom", icon = "RENAME_Z").type = 'ZAXIS'
col.operator("armature.flip_names", icon = "FLIP")

# icon buttons
Expand All @@ -4903,9 +4903,9 @@ def draw(self, _context):
col.operator_context = 'EXEC_REGION_WIN'

row = col.row(align=True)
row.operator("armature.autoside_names", text="", icon = "STRING").type = 'XAXIS'
row.operator("armature.autoside_names", text="", icon = "STRING").type = 'YAXIS'
row.operator("armature.autoside_names", text="", icon = "STRING").type = 'ZAXIS'
row.operator("armature.autoside_names", text="", icon = "RENAME_X").type = 'XAXIS'
row.operator("armature.autoside_names", text="", icon = "RENAME_Y").type = 'YAXIS'
row.operator("armature.autoside_names", text="", icon = "RENAME_Z").type = 'ZAXIS'

row = col.row(align=True)
row.operator("armature.flip_names", text="", icon = "FLIP")
Expand All @@ -4915,19 +4915,19 @@ def draw(self, _context):
col.operator_context = 'EXEC_REGION_WIN'

row = col.row(align=True)
row.operator("armature.autoside_names", text="", icon = "STRING").type = 'XAXIS'
row.operator("armature.autoside_names", text="", icon = "STRING").type = 'YAXIS'
row.operator("armature.autoside_names", text="", icon = "RENAME_X").type = 'XAXIS'
row.operator("armature.autoside_names", text="", icon = "RENAME_Y").type = 'YAXIS'

row = col.row(align=True)
row.operator("armature.autoside_names", text="", icon = "STRING").type = 'ZAXIS'
row.operator("armature.autoside_names", text="", icon = "RENAME_Z").type = 'ZAXIS'
row.operator("armature.flip_names", text="", icon = "FLIP")

elif column_count == 1:

col.operator_context = 'EXEC_REGION_WIN'
col.operator("armature.autoside_names", text="", icon = "STRING").type = 'XAXIS'
col.operator("armature.autoside_names", text="", icon = "STRING").type = 'YAXIS'
col.operator("armature.autoside_names", text="", icon = "STRING").type = 'ZAXIS'
col.operator("armature.autoside_names", text="", icon = "RENAME_X").type = 'XAXIS'
col.operator("armature.autoside_names", text="", icon = "RENAME_Y").type = 'YAXIS'
col.operator("armature.autoside_names", text="", icon = "RENAME_Z").type = 'ZAXIS'
col.operator("armature.flip_names", text="", icon = "FLIP")


Expand Down Expand Up @@ -5600,8 +5600,8 @@ def draw(self, _context):
col.scale_y = 2

col.operator_context = 'EXEC_REGION_WIN'
col.operator("pose.autoside_names", text="Auto-Name Left/Right", icon = "STRING").axis = 'XAXIS'
col.operator("pose.autoside_names", text="Auto-Name Front/Back", icon = "STRING").axis = 'YAXIS'
col.operator("pose.autoside_names", text="Auto-Name Left/Right", icon = "RENAME_X").axis = 'XAXIS'
col.operator("pose.autoside_names", text="Auto-Name Front/Back", icon = "RENAME_Y").axis = 'YAXIS'
col.operator("pose.autoside_names", text="Auto-Name Top/Bottom", icon = "STRING").axis = 'ZAXIS'
col.operator("pose.flip_names", icon = "FLIP")

Expand All @@ -5617,9 +5617,9 @@ def draw(self, _context):
col.operator_context = 'EXEC_REGION_WIN'

row = col.row(align=True)
row.operator("pose.autoside_names", text="", icon = "STRING").axis = 'XAXIS'
row.operator("pose.autoside_names", text="", icon = "STRING").axis = 'YAXIS'
row.operator("pose.autoside_names", text="", icon = "STRING").axis = 'ZAXIS'
row.operator("pose.autoside_names", text="", icon = "RENAME_X").axis = 'XAXIS'
row.operator("pose.autoside_names", text="", icon = "RENAME_Y").axis = 'YAXIS'
row.operator("pose.autoside_names", text="", icon = "RENAME_Z").axis = 'ZAXIS'

row = col.row(align=True)
row.operator("pose.flip_names", text="", icon = "FLIP")
Expand All @@ -5629,19 +5629,19 @@ def draw(self, _context):
col.operator_context = 'EXEC_REGION_WIN'

row = col.row(align=True)
row.operator("pose.autoside_names", text="", icon = "STRING").axis = 'XAXIS'
row.operator("pose.autoside_names", text="", icon = "STRING").axis = 'YAXIS'
row.operator("pose.autoside_names", text="", icon = "RENAME_X").axis = 'XAXIS'
row.operator("pose.autoside_names", text="", icon = "RENAME_Y").axis = 'YAXIS'

row = col.row(align=True)
row.operator("pose.autoside_names", text="", icon = "STRING").axis = 'ZAXIS'
row.operator("pose.autoside_names", text="", icon = "RENAME_Z").axis = 'ZAXIS'
row.operator("pose.flip_names", text="", icon = "FLIP")

elif column_count == 1:

col.operator_context = 'EXEC_REGION_WIN'
col.operator("pose.autoside_names", text="", icon = "STRING").axis = 'XAXIS'
col.operator("pose.autoside_names", text="", icon = "STRING").axis = 'YAXIS'
col.operator("pose.autoside_names", text="", icon = "STRING").axis = 'ZAXIS'
col.operator("pose.autoside_names", text="", icon = "RENAME_X").axis = 'XAXIS'
col.operator("pose.autoside_names", text="", icon = "RENAME_Y").axis = 'YAXIS'
col.operator("pose.autoside_names", text="", icon = "RENAME_Z").axis = 'ZAXIS'
col.operator("pose.flip_names", text="", icon = "FLIP")


Expand Down
12 changes: 6 additions & 6 deletions release/scripts/startup/bl_ui/space_view3d.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3969,9 +3969,9 @@ def draw(self, _context):
layout = self.layout

layout.operator_context = 'EXEC_REGION_WIN'
layout.operator("pose.autoside_names", text="Auto-Name Left/Right", icon = "STRING").axis = 'XAXIS'
layout.operator("pose.autoside_names", text="Auto-Name Front/Back", icon = "STRING").axis = 'YAXIS'
layout.operator("pose.autoside_names", text="Auto-Name Top/Bottom", icon = "STRING").axis = 'ZAXIS'
layout.operator("pose.autoside_names", text="Auto-Name Left/Right", icon = "RENAME_X").axis = 'XAXIS'
layout.operator("pose.autoside_names", text="Auto-Name Front/Back", icon = "RENAME_Y").axis = 'YAXIS'
layout.operator("pose.autoside_names", text="Auto-Name Top/Bottom", icon = "RENAME_Z").axis = 'ZAXIS'
layout.operator("pose.flip_names", icon = "FLIP")


Expand Down Expand Up @@ -5446,9 +5446,9 @@ def draw(self, _context):
layout = self.layout

layout.operator_context = 'EXEC_REGION_WIN'
layout.operator("armature.autoside_names", text="Auto-Name Left/Right", icon = "STRING").type = 'XAXIS'
layout.operator("armature.autoside_names", text="Auto-Name Front/Back", icon = "STRING").type = 'YAXIS'
layout.operator("armature.autoside_names", text="Auto-Name Top/Bottom", icon = "STRING").type = 'ZAXIS'
layout.operator("armature.autoside_names", text="Auto-Name Left/Right", icon = "RENAME_X").type = 'XAXIS'
layout.operator("armature.autoside_names", text="Auto-Name Front/Back", icon = "RENAME_Y").type = 'YAXIS'
layout.operator("armature.autoside_names", text="Auto-Name Top/Bottom", icon = "RENAME_Z").type = 'ZAXIS'
layout.operator("armature.flip_names", text="Flip Names", icon = "FLIP")


Expand Down
6 changes: 3 additions & 3 deletions source/blender/editors/datafiles/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -635,9 +635,9 @@ orientation_view
orphan_data
outliner

#~ DEF_ICON_BLANK(654)
#~ DEF_ICON_BLANK(655)
#~ DEF_ICON_BLANK(656)
rename_x
rename_y
rename_z
#~ DEF_ICON_BLANK(657)
#~ DEF_ICON_BLANK(658)
#~ DEF_ICON_BLANK(659)
Expand Down
6 changes: 3 additions & 3 deletions source/blender/editors/include/UI_icons.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -652,9 +652,9 @@ DEF_ICON_COLOR(ORIENTATION_VIEW)
DEF_ICON_COLOR(ORPHAN_DATA)
DEF_ICON_COLOR(OUTLINER)

DEF_ICON_BLANK(654)
DEF_ICON_BLANK(655)
DEF_ICON_BLANK(656)
DEF_ICON_COLOR(RENAME_X)
DEF_ICON_COLOR(RENAME_Y)
DEF_ICON_COLOR(RENAME_Z)
DEF_ICON_BLANK(657)
DEF_ICON_BLANK(658)
DEF_ICON_BLANK(659)
Expand Down

0 comments on commit aeb4417

Please sign in to comment.