From aeb441752751c2ded595df439b8bfb0589e9f40d Mon Sep 17 00:00:00 2001 From: ReinerBforartists Date: Fri, 25 Jun 2021 10:26:21 +0200 Subject: [PATCH] Pose mode, autoname needs unique icons #2512 --- release/datafiles/blender_icons.svg | 63 +++++++++++++++++- .../blender_icons16/icon16_rename_x.dat | Bin 0 -> 1048 bytes .../blender_icons16/icon16_rename_y.dat | Bin 0 -> 1048 bytes .../blender_icons16/icon16_rename_z.dat | Bin 0 -> 1048 bytes .../blender_icons32/icon32_rename_x.dat | Bin 0 -> 4120 bytes .../blender_icons32/icon32_rename_y.dat | Bin 0 -> 4120 bytes .../blender_icons32/icon32_rename_z.dat | Bin 0 -> 4120 bytes .../bl_ui/space_toolsystem_toolbar_tabs.py | 46 ++++++------- release/scripts/startup/bl_ui/space_view3d.py | 12 ++-- .../blender/editors/datafiles/CMakeLists.txt | 6 +- source/blender/editors/include/UI_icons.h | 6 +- 11 files changed, 95 insertions(+), 38 deletions(-) create mode 100644 release/datafiles/blender_icons16/icon16_rename_x.dat create mode 100644 release/datafiles/blender_icons16/icon16_rename_y.dat create mode 100644 release/datafiles/blender_icons16/icon16_rename_z.dat create mode 100644 release/datafiles/blender_icons32/icon32_rename_x.dat create mode 100644 release/datafiles/blender_icons32/icon32_rename_y.dat create mode 100644 release/datafiles/blender_icons32/icon32_rename_z.dat diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index 162b620735ea..4594490dc0a3 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -35,9 +35,9 @@ objecttolerance="20" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="4.0000005" - inkscape:cx="210.22202" - inkscape:cy="268.73546" + inkscape:zoom="5.656855" + inkscape:cx="1089.0272" + inkscape:cy="187.53346" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -44871,6 +44871,63 @@ d="M 1,12 V 10 H 1.5 2 V 11.5 13 H 3.5 5 V 11.5 10 H 5.5 6 V 11.5 13 H 7.5 9 V 11.5 10 H 9.5 10 V 11.5 13 H 11.5 13 V 11.5 10 h 0.5 0.5 v 2 2 H 7.5 1 Z M 5,7.5 V 6 H 5.5 6 V 7.5 9 H 5.5 5 Z m 4,0 V 6 H 9.5 10 V 7.5 9 H 9.5 9 Z M 1,3 V 1 H 7.5 14 V 3 5 H 13.5 13 V 3.5 2 H 11.5 10 V 3.5 5 H 9.5 9 V 3.5 2 H 7.5 6 V 3.5 5 H 5.5 5 V 3.5 2 H 3.5 2 V 3.5 5 H 1.5 1 Z" style="fill:#323232;stroke-width:0.03125" /> + + + + + + + + + + + + + + + Y5QaCJ5DU@6MiD^}OkpJ{Yy`Ek&_*j!`&1T+7M4K>m_TKS!)hUejT?3q@Mzoa$$p7hz2g`L{{7hzs2 zjC=I`r&{T4x5rwObm_gJ_{sud2buTkkesMJlBD*o zwpJvyJM-q}^Tzy`^e#K~?fZMb_x-&0=FJq1F-0`nYs@+Rh41%Jboq!#fX2{378Nmj z*|D#dP!{4Senn06t{K?zI5r)8RC_*$xj}XI?nC{WvDO^G(=t2S^EvE2y2#GKZ=iffeN|NPH@#~}(DX=czLio%7 z9{6g?SG7xK0_H7cZ*fa6r}OHt1=tr9I(K6?M>gOLi=4I0JDkF|l*u~(=rP;}T-muB ir+gm9?c3nKA6RQG%l%|b38o3VnT~7exb#2U?f4tP9F0-{ literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons16/icon16_rename_z.dat b/release/datafiles/blender_icons16/icon16_rename_z.dat new file mode 100644 index 0000000000000000000000000000000000000000..3abbd2e1ddfa4d8bbbd25d6becbc00c201478db4 GIT binary patch literal 1048 zcma)+KPbdu7{_07O!T`^nJyL?ltr=`WFZ5ELKzKL7#Nh4S;}U)S!|-qWI$I+VNg}1E_j}*R=efJLe%|`Y)%Tv~p6B^I&-<^7j4=_KXfx&%`;Fac#o;5dOsndCRR+b% zT0Qa4FB{te{6d`<>2o#roQ8^+tuP0F=wertnvB?*J-{!8HI3e;*Ev(AM|UzW6&Zjj zBSA51nM~%rZ>`yd7x)by^Oj&%sxpM_@v)?ZX@PxJ9{t)MOpdv?sDfVD$5@i}K0Tu5 z{H*r#arS@Ytb63#H{s9mAAByf%7-zyZM3d&W{=Y2EUfXrQ}}#y?ImoP`S;jM&T++a ze_865sXq=yd|o;B+Rog&P{cbMdEqstfAp+iFOc5-Dw=63qZDsupV@l%st@MQh25y{ zf`3BS_#MeS^-FL?bc0UP&L1uZ|IRxqBze6*dMv_T@rH)6Z^^v+uo2RGpQVSz=6wz8 r--FS$e{z50+Q;X-g()L_dtP5Y$NS4Le+t|0W1&sV*EOj0@4);3S(}Lo literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_rename_x.dat b/release/datafiles/blender_icons32/icon32_rename_x.dat new file mode 100644 index 0000000000000000000000000000000000000000..66b0715e0c649c05d99eed9515b18809ff0e0e1e GIT binary patch literal 4120 zcmeH}O-L0{6vs!)N=wob3M~ z5$Fpl$reFSEs8`4B!i-o!iaL-%^A&m3d3F*`r$~J4UI~W4SKPkst=|*>Yp|HH3sG;_OSZsAn=3BU^(IG2fGs7 zJ;^z^sE_$$)(eXKT_-mTM-ToO5^5Zt#e(JiH8_+oV8}h)$ zCe4&-vY2OziPy>A6Z`GND+QbAKPKyo;=b9cSoCun+w8>NgRPOcJhC1UvEB8{o=OkS zXgg=}R_no5M0L*k!S+f_AF$&Vp9Me11m<*HADFX>OKPySoX%^-rfD$qq|RMG=hWqL zQ8%i!;LFLMkNv=OxY(o(zJ&8=hJP<|%)YzKfXs?7d8u*x6CYF_@-_HV7XR5|k6K?i z`V^bg)XI!rv-d*oTrGXtsF|LrAbhDciT)vLyhv;h*m%z1x*hfB&Jh2BMDs3l9o^Hc z*$3tZeb!lAm10t~PfcrT{~&w;Ue_G;z#o_QcksK2O{VY~oqzCU?Dr|&=?=IIvmm^W zqW3jst#U>0>dv1Zbi&a>-F@)G=<9B8ts_B$PhAs-%Wg}VhYvn{=?B(XkD>z zGrqsf3Uh6xyjc4>(|L^XI>OL1Rxzfqz{2u{RJ8 zY>w}kw@7ov)bQ5PW5V|NiN6}Dz#p-(0Dns{dnUQyKVo~ySq!n)SJlVvN#fIdI7*SZ zX}LmT^y}B2j(!JcLH7;Za_T zSEo6_QS;s5$a(G#M(<8OEi?QW{&wV_`{neOdyq-tO`ZD`T)zGjoC)8^+-E}Wq{Ep3 z-=#kGEq%{?8V+~=Wz7$X9Y&(xkhyBfH-eqC{U-41koowpY%Ii&e~aYdk^ZA#&mk*v z;oLa5Qfh{5A3iVMAJ!lm{5XUdiBxo=gyAX^9K|%ZgiG?77U=%A63lX)_LPbO{AQ~0Zi8d-h!4J?v z#Zn6qER13T7V(RKpr{}g7RC<@yg!+JNjT`?J>0v7ucDwb@a-lyT$v5`|0O-IzRFqeTKsO{*W=D!4|6Z5J;@b6sh6>jPrNZ`2>JwRoh^8q(&pyXm4W}2 zn$L52?IZ`SZ+Bj-G{3y~)bzT}Cyy%dzq=ep8Bgq)`sC%g@k4XQj~Rv0JFNlub-t|} zIWIm~cQr0}^^Aud{twkxnkV~@@gC0Ja@XJS{v+S6G_J-=;J?>;d;BN0Sgih)<~}}W zxRdc#u%AMoq5ITgg^$Voafto=ASAMHn~I#oFBOA3y;J*17dF=3*7952-bPVS$98CH?;Z#rEyQukkWI1z9hIN&w7b?P_V=b_vSzJHcX+y!6^Ivi>itW;lQdEbW4HYmP- wY_^7aAEXAC$>SmG?Sns(b4YGW)UOohyqzX~pAhj+B>mByRJ-^l?f>KWH+JLr(EtDd literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_rename_z.dat b/release/datafiles/blender_icons32/icon32_rename_z.dat new file mode 100644 index 0000000000000000000000000000000000000000..212b4a113c14a0b2d6866c18b8a4181211c8e128 GIT binary patch literal 4120 zcmc(iJ!lj`6o5AuBN5T$@GlT^93ohVf&{EmXrUlMEyTZIqm_-=1w;f>2r1$ZMhhbf zYG>yUMvM{=1A+)*8nH-3i2;csrijVi?)bf924*KayBj!g;W6{xyqWLK?3pyt&!ZC`8K>sg1nF{(xi`9rEAC zgafucPhF{i*=9egs`hFAbJv@;gT6M`*VW;lKssH!tHU^?8BZ6rRn#8c_S$XB(xWIC z4Z~nC%THC*Zq1ls{ny$4tpA{Hdt}?Q>ddH=~G{js*m z`@iTPVQ~x0bFh^N^&^Wt;uhw4&#)3o$;*y-k8}<0xZzU{r+WtyWDDGv3GCmJpIQCw zcIMk@v1JWHY?<*BLxbc3Yv0Ry_rX1dEp{H*9ABNByXNp2COGf&PqNb?HD{9ghz-s% z*wZc_eS)^s^MLstXZ^>JP``&M$$w&r?Fk=S^9yj=kWD5AscR|t`m)|v6W+a?i6UQ# zVU4e^&u;j>c4KGk%`hU1Kh19Zg#Opqi0_K=&s*l^SJeT{nIr#pnemCM75lJmdu8l- z%iMhKJs*RdsKrJe+|SE3e!2NdHNqc7rkL|8(_c!~{Sx*C?%W~!nku|1GCKA9Ke z|3Ku`a8mPS9ljGo zds<({-oXBo^GEK0S=sM;KTc52Nu9laIc*HLO};y=7~T>?>V2-ypGk>D?f_x(9dedE zaZJZD;xf{7c#ZI%nHY%YfzO|RoUM9}wSNql`!)YG@pNeZn6JOjP7Fo(pG^$ty-B|C zj%vmmcybossqy(9K`-gH%=?e=ONjZ_Fl9GcN4rkKLHKm+#`!UDmPW~^qpXjjKVGY50M|m5) cP1{#fm$NB$-X@Qcxc=rnn6jMI_kY;_0giE0^#A|> literal 0 HcmV?d00001 diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar_tabs.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar_tabs.py index 840452668196..bdc5547e67f2 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar_tabs.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar_tabs.py @@ -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 @@ -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") @@ -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") @@ -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") @@ -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") @@ -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") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 0351192463a6..77ea2971b4eb 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -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") @@ -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") diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 84f1b9996c4a..bc901869f7ad 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index ac629fbbdc5c..99d3fbed8f29 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -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)