From f267921774ca0755040f73ea53319002a987c166 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 3 Nov 2018 20:33:59 +1100 Subject: [PATCH] UI: remove grease pencil icons Grease pencil tool now uses an icon for each tool, previously it mapped icons to tool icons which is now not needed because for each tool a different brush can be selected which has it's own icon. --- .../icons/brush.gpencil.draw.eraser_soft.dat | Bin 1484 -> 0 bytes .../brush.gpencil.draw.eraser_stroke.dat | Bin 1970 -> 0 bytes .../icons/brush.gpencil.draw_block.dat | Bin 710 -> 0 bytes .../icons/brush.gpencil.draw_ink.dat | Bin 1610 -> 0 bytes .../icons/brush.gpencil.draw_marker.dat | Bin 1502 -> 0 bytes .../icons/brush.gpencil.draw_noise.dat | Bin 2312 -> 0 bytes .../icons/brush.gpencil.draw_pen.dat | Bin 1970 -> 0 bytes ...pencil.dat => brush.gpencil_draw.draw.dat} | Bin ..._hard.dat => brush.gpencil_draw.erase.dat} | Bin ...w_fill.dat => brush.gpencil_draw.fill.dat} | Bin .../datafiles/icons/brush.particle.weight.dat | Bin 3356 -> 2924 bytes release/datafiles/icons/ops.curve.draw.dat | Bin 6416 -> 2546 bytes .../icons/ops.curve.extrude_cursor.dat | Bin 4292 -> 1844 bytes .../icons/ops.curve.extrude_move.dat | Bin 3986 -> 1754 bytes .../datafiles/icons/ops.pose.breakdowner.dat | Bin 1970 -> 1538 bytes release/datafiles/icons/ops.pose.push.dat | Bin 2834 -> 2204 bytes release/datafiles/icons/ops.pose.relax.dat | Bin 1196 -> 1106 bytes .../icons/ops.transform.bone_envelope.dat | Bin 2834 -> 1718 bytes .../startup/bl_ui/space_toolsystem_toolbar.py | 27 ++---------------- .../blender/editors/datafiles/CMakeLists.txt | 13 ++------- 20 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat delete mode 100644 release/datafiles/icons/brush.gpencil.draw.eraser_stroke.dat delete mode 100644 release/datafiles/icons/brush.gpencil.draw_block.dat delete mode 100644 release/datafiles/icons/brush.gpencil.draw_ink.dat delete mode 100644 release/datafiles/icons/brush.gpencil.draw_marker.dat delete mode 100644 release/datafiles/icons/brush.gpencil.draw_noise.dat delete mode 100644 release/datafiles/icons/brush.gpencil.draw_pen.dat rename release/datafiles/icons/{brush.gpencil.draw_pencil.dat => brush.gpencil_draw.draw.dat} (100%) rename release/datafiles/icons/{brush.gpencil.draw.eraser_hard.dat => brush.gpencil_draw.erase.dat} (100%) rename release/datafiles/icons/{brush.gpencil.draw_fill.dat => brush.gpencil_draw.fill.dat} (100%) diff --git a/release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat b/release/datafiles/icons/brush.gpencil.draw.eraser_soft.dat deleted file mode 100644 index 777e3aabe40825d556b5ab17132bfc80242581d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1484 zcmdr}!E4%Z6!ve?R*M)F@n8`|5CcZk5owe7Yph00v`V5@0@Dh`;SPdOD55CrqOgFV zh$w0fBBB>hJ9*nd>VL7##W5jx+F>hn{CM!*_kMiu``){D_!RrSLNUQb&)n}KNeoae zXY*393-Mk?xbL_Hdmo1LwiJ@fY7%D&)hscMEEpxGCm=9Pj~J1w*@{r}GD$z&=I(NL zl}MSrDj~V+k{DWo74>M$YKjn`SdgSGoGEHcnQ^PvN;J|!T)4Lq2;GzZlv{u)@Q_3HxPh=I>tbmq6UqGy5+P|@Qe z5tPJQ&YDef5bsJ3I_{QJu)}!^XG>)@*^9*4EHS315hZqx>WN``5F0Ty+oQ1vC21BM z96a1sB3C6ikL1LVNG^e-|01ga6p69G!s!@O)GX<=dK>8`EyS&a)r+9&u%t9-#I-(? zx6D=|OwYQan+5+gTa#&j>!jSpfXIl<@t0orl*VMi4!P<)`< zTi3V#&rv@6G0HpYj;f;yKOtqL{O$u*zzXDhil=y~BjHFHD?GnEy#%^}ZoblANN?3! z_tu>+?M-|0>1%yk-#-89_7?}dy*V&D>QP>yP)Ha5Yw<(kI>v$bkjweM|E|BC;PO9j pF_-&1dXr;E->>0KzW>vCuc_m7_P?yOUm%w1$7Eg5blZyk`<$>*NjuOFup2V z{&jMbZU{~GUU&{aF|Q%cFHx~TE7D@ye1cHDI;oS^faM2-;!O||CHepn9*PBG?_NV~ z<~QnkWS_(L!UNZe)R|3sodk0rl{F91uaBTo7|BQS7t1Ah27AoDY1}Hhj^Ich%LHI> zmNHx_v;k86cJBhdNSeMBW#Crdv@g}W&|_lrSf<}5>`LYgo~O&%A}k@&NAP6nAbpr~ zY(1_Et8xjsxkS#cw7NDJC!#c{xgIrM;&_)zl-Ci7puq7oAfiEm8XJrcE4LGM?OJV2 z*0d``^ir$pr)tS4j9Y$dV4Z9Tb*71&J+e;>=MP~L)rugGYyxp`si2@k&$( z6Mf+!&L0cBhMt%<)8Wjn3GQ87KW|#u2y0Epcn~ ztNdAAF+NN=Qx4LQ;@;O@zPu#&ll#uvUKyRAyVc$5_r}iM&fT}xMrWh5_V;zK?CLvr f?oM%g#_@POD3jglGU#TYn}L7NK&R7r`(Nr0ZochV diff --git a/release/datafiles/icons/brush.gpencil.draw_block.dat b/release/datafiles/icons/brush.gpencil.draw_block.dat deleted file mode 100644 index fe4175c6d09c93e1894b791d6ecb42131738ba41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 710 zcmWG@_GkG2pMjyx{dBlXY(jy5ja0Z)xNM-hSDU+)T!g4pIEV$3kqSQ@zB|z+w#_|4 z6r@%vyv<$B%g9?g;y_%R` zO)72b?Jii6(34)8Upsm7u?yuJ6M90M(o4(Nm#?b;!iiHRO+I$&_^IQkk6k!+aqrEI zk2gNq@MP`d@=fI%E7nb#JbCi*bH~pgyRhZa=Ep#}#~Yrkf4u%NP=4d&$x|mEKMjQE pfI5NlAldamaUfg|)CQCTiEjjoFfcFx{X2B=)2C1Wk7Cp?003}ntMC8- diff --git a/release/datafiles/icons/brush.gpencil.draw_ink.dat b/release/datafiles/icons/brush.gpencil.draw_ink.dat deleted file mode 100644 index 3137a3f431a54a5e8c7a0b6010d3d9a63c402d88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1610 zcmeHF&uiKM6!wpBI}5_Z)q<8HtoE?7(gfR7qG&X<;zGor)?YQf*w`E@4JrmRtHm7* z4m!KC7NzczQ1K+}AVM?nG!Q024<5!4Z!Y-{cAq@ndmrC>Jl^|wu6H)oVxdwQft0g` z?L=S_KCuucpB~X8uV5XdgI-&WfDw2D?8s^$Ct@MeTK`K-jj01KXbr8Y ztTfCGbNj6bir^#EfjjV{Q$Pjuo44s}`o3T_**?5KJFH=6hcGOlOK5&NXvS+ErJH8=|GP>*jiQ*T!9Tv znRh(cM6l%$K>;<`^oS0+ceNY>x(XR=I_TDY?-J1Uy;b?Dy64udU>#%xw)WTej6mHZ zpf!wh*FDOfTl3(U7AQ8%hboauA{S%G%wXD`XM5+JBLDGo{HDmC zwzIuYU;D%U@ad;Cl14v%NfT-E^gNgjrr-bcX2PufJKM|l`a`8EO%%R2>(0A#VW#lX lXfQqRoVJU6{3cT>@+y@|{*9$CHTd@*7>~z`rT>2#`~_jJU;Y39 diff --git a/release/datafiles/icons/brush.gpencil.draw_marker.dat b/release/datafiles/icons/brush.gpencil.draw_marker.dat deleted file mode 100644 index b0b821109a3b0e37090499df7cfd53b884e00767..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1502 zcmeHF&ubb{5Z=E-S`b!?;z4jlx`Kw+W;L!2J{EthxbD-9KUR^(Al>yDVl^c_=w(9! zUb>`EtcUPwE~OOhrPo}04Lu3@FYLbl1-%wzm|^&4<{S8C@-H*YcFQo!A^~ev_Z@jE z?ur{d)m)mZ>3aQSs4A2pKG^UJ%8Eb(~!W0IHv;ASLMKit;YY78kus@9BIDY;n)b%%?9eI!ku?j1* zvNsoy0#XxS{lTBlVJQ#^~|Wd3+}|NYne@x$-CdvkjAQ2t!KDBR>NbNc1y f)kF27`@V3)FpP8eo$oZ*{lLHcz-F`A{%`&V*3vc_ diff --git a/release/datafiles/icons/brush.gpencil.draw_noise.dat b/release/datafiles/icons/brush.gpencil.draw_noise.dat deleted file mode 100644 index d29c0624704519b8648e9c61f4e8b75e773de5f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2312 zcmeHGUrQoU6!(irARA-h;>t!sGQ}3PihnZFhUVTJW=40W$$2PcgEX^<+(k(g$IMEm zSduMVqjpIUWamMG4g3hb2|evwuq;x0?|zNqa?bgkbARVt&b{Z(O-$>ao^(15o;gk@ zRr2iJ)zsBg!_jnU@F&yaT3j=9Ez}mjE~?^zm|IGPv4?RgyuQ@pt_4+GUy6Q^0@z9c z4YoK{MA<$Ks^ryF)1{KQmMTgC4np97B!GYfZzzalz-Oeaf=xD3HhFYqV$~UUC)^2V z!XCHBM?YF*i##aybN!qlV4w|iuVx7^;T?3FU1rx?=P+6}=eT>^ZJ(z6!w6A+!fSR7 zJ298=T4a<*yHPERJhAFdSY*OG?8F?(&&*G(T4V!_&os~xdY%3RB1jZoM4rMk^CHql zYIMaw6MiFww3nGzc*2j-fRFGIUI>syn(!(-?o8p2Y$~b2v?*&YSxeR<8}6EemEdvk z3s+@T5u>!JWYyqC|IR?#6w*uj`fcO2B41?vk&s&jF1&~fa*I0{Nc)xaTJ;j2Jp zD^e+16c6}n=m=}^AX;3^g)@=@_CR@NpWkJ0O%;>_hf+yWqD8*SRzgRMIUyU)+&nZM zlbyA8s+#|n?3BN^?=E}if0CVKr+s&O-*~+2VSIak^RU*AG*eZfo~lNg?Ym!H9Mk@` zdaYjbv4PeP#J#=0{eAOr^U&%w9))`RAXU}rbm$kn$jcqP%)oP=fo`|^^disi4*mh7 CxGi1) diff --git a/release/datafiles/icons/brush.gpencil.draw_pen.dat b/release/datafiles/icons/brush.gpencil.draw_pen.dat deleted file mode 100644 index d31e2055687e68a839706fa76242f4b0c0d4ccd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1970 zcmeHFT}#_w813(HzFP{`Zr(^cun^p!8-<#x{Yr{8nIE(BBcT<O=CZ_9W-7DGVo%cQ&z-5=Z|o2_7`?H%EJTa91ibuc;3hJ+^)I1(`bq_ z3MDdG3;#4_GFYErwo!ofSPj-L=e-etA!Ikv#bD93jnqVg+Xhd}cq+0xaZ>z8LV~EJF5A4EPWdU>~P4zDM5v354t=9(fTm^f1sv zYiaHLgLyCy=J21PMm(XxGvomeizz>cKt`=vT^zKXXCoo zF5gP93T;(Uc~J7DL-C*#D{=C6W>bnwNm)(6=eA0l5_b@*s0k9)wc~s%eU+$2jyRb+ kh^u~ntHkG$vPPqUH`(dV4mvmRFE?;=b92|}|7!<-028&mj{pDw diff --git a/release/datafiles/icons/brush.gpencil.draw_pencil.dat b/release/datafiles/icons/brush.gpencil_draw.draw.dat similarity index 100% rename from release/datafiles/icons/brush.gpencil.draw_pencil.dat rename to release/datafiles/icons/brush.gpencil_draw.draw.dat diff --git a/release/datafiles/icons/brush.gpencil.draw.eraser_hard.dat b/release/datafiles/icons/brush.gpencil_draw.erase.dat similarity index 100% rename from release/datafiles/icons/brush.gpencil.draw.eraser_hard.dat rename to release/datafiles/icons/brush.gpencil_draw.erase.dat diff --git a/release/datafiles/icons/brush.gpencil.draw_fill.dat b/release/datafiles/icons/brush.gpencil_draw.fill.dat similarity index 100% rename from release/datafiles/icons/brush.gpencil.draw_fill.dat rename to release/datafiles/icons/brush.gpencil_draw.fill.dat diff --git a/release/datafiles/icons/brush.particle.weight.dat b/release/datafiles/icons/brush.particle.weight.dat index ee14fa4eda5b81bcbd7c8064b08b6c8ea199fd47..833bbca506bf2f29818a9b314745a7bc49d0bf21 100644 GIT binary patch delta 806 zcmchR;Y%7}9LIAREO2|V7ehwu#pvZ;G}sv&^rBfA7pN;)fwsJd;cy;I0_WlCw73Jg zbm~1+mJa6&jX1%}y0|cJr=Hx=3i?B0>_2GF>-_=a`|A6Af8WpdDL=b=3f?(AL-+SX zLmqO*@AilEwRTwjC$&!U3cp$Gwgk>#tRusud6tE$#r`BsvutuR<&C?xh;3&A zXQ$wA%d4cB9b`4s1~JsmYPoh%I4tH%+Z4P0HD2I$cXslJ#d1Zca;TBO6Zpm?gE80^ zg0l_|`3zIw(tJrN$bxjB=Gq0hT=`xT>gARo31XVgFf5z$#@un&wv(Pt;9Er8MNg+f zU&1lKuEWa*FOvKEt|6F$nKRI52AN(~%WC_&U`k}o-}D>0*1l3rpLh*vWYdZ7Fv-V=g4=M zE_cDhyJ5Rcp*svhd+Y8a7aX%X?1nxt`extMjLrb5r)sKZ=zSALtv>j2bX*v*!_?>m jytUe3aKtA(w80IO{1~;Pr+-okYUp~yI{zPwf2_8@cWiV5 delta 1009 zcmdVUPfHs?7zS|vRu4Ip9!e7xdys-8Xxv2E zln`Ux?4V7JpdO5e2yUX0NJ!YsI&2XABBh_9cG7!4Ku_;5^Um{oem&lQ5`XLAI_~c~ zIyiA8=nn=Mj^)9}YY~NO^SY4#usbDBM8=ndWKf$;f6j?VLY@bHYLW`LcrZzYl-cyO zD&PFPkFMxT>%l1+Gx%eu!y8q zn9R7i9E=B(Oq@-C@7FrouH|$s|7~|eUX4VTvdK*?mEOzgM_N7s6l$GPT?w#GWt3D} zRW-bYGYG~yoz6HLqZ1$%Rn_=ff{%FDeH)$?5(*2QL+?-qZJ9f^jtJ1w@QzJTX_=s^ zJI-#`el*(fmf5EFa$0^vR==!9vdNvzO>Hl?f1n>FK#W!hon#Uqqhyn*w1&6sEexM_ zwdoZmMyH|~MO730vOnUDv#NW;1K)JH26d#7iaWN3b)>hp$uz{{;92mJG1wBYuPtQO z;66zyfitR1Ra_-drs~R7`a*5uI<6yVl1GC*rAwe1y-eCM7bNq|4QhMu81 zYM9uz5J_t_F}4k{ARQB-;x<^bcGGAp@J08)cnO@+XT-Qg-Ah!?IyO6)iTM1 zOFd4Q>I*=j-=X(A;j0G@sP#Hwh)lWH0f+nd|DIz#4)}@OImpgo-|)ZJ2jRm$8Jc9R L9nt>wAEy5SchR-& diff --git a/release/datafiles/icons/ops.curve.draw.dat b/release/datafiles/icons/ops.curve.draw.dat index 5622b99a1f39211d5d1ddb88e9a14c52a760342d..5228833daa344d39274c312dffc6d29442de8507 100644 GIT binary patch delta 758 zcmW-a?@JnC9KZ|qVz8GX44jh4jENy!%2jvgK_?-)&c#$n_B`_8dGq~zzRx$0{OjRAQ0A`Z=dP{| z_bO9#?J--vGJWZ)I?pEs`}yR>#EJKiKAz^r!uSHoXr?d+GD2zy9Xf~3;Ed*sIi9XM zE1q3;k1^sp)G%Phz(bDw70)5PK3k@@d_(#HqlO6MUUCkd!mNk`X^dY?)ZTBn*JoFG zW{=rrw|tkbGp6bk?3b?d$rJC9|BzlFc@sCrjm_)B;Lr>{g^iFydJQp$ddV65j5+Zh zPggt#>@I7>M@SuN#f-RN;K+Z#Ry^yo8}2e4#^?235}X7_8{>lgVgi*Y%*Y#5qO>T? zU*487p}ytQ?g+0IVIoY1$p+G<|BVN2MO)|4e>$(nP30;ra)E4CH; ziv6bp_E|S96E@i7%pGfo^Q0qXDaN)F<$O86SttScVty@GjFpx)0cD`J6Fc8`GCP^y zKVVcUtmW2nzf#3mF}AtXu^BjrJ9VN>v<+>;y|HC#nHt8rp>DVy6)1taChJ6YZW~Z#hVbko`b{x*ZKDYnr<)7~T>Z`vm{sVluRR;h7 literal 6416 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 O&m`ymJv4KkNA!P}+~!sQ literal 4292 zcmeHKTTdEm6!kv{1PP^7AKQp>85kIb0R$;XvDm6OfP!)m4y9DNMr~;5#n@YHHH2e9 zu7ysyNG7z#*Pg>e`>H>oPyG>|J^c+QJ!!&x`7--kd+)W@Om>(sueS|dUJec6oQ)Z=EZ!*lNtW##&ve9dG&8|%QY|G{a!eP2=acG_91-tjAe|BYV zb@mTSK!eDn8VR95;JGBDdOsGL`QkqfI^qgh^zhk;fI5Z1WW|dWGHq2l) zmDRR9?K663S8n>JedYzNlWn= zZ{v5=_WjK3m(TYOpT6CH{W2B}Z$*-^XzbyGon$PTjy>E?Y(Gk-%WsO=;jLIS8H+tk#>CEG;-JQ&n++N{T_8@yuc*U^4 z%Q5^f($98Zr1vw=_lnv4U+;3^Z}VqPdj8D*!AU!5eT5B-Jz+^O)6I})Q&pcZj8M`lXCO4LKi<38ZD~({-jqwt(?|-m3F&Yua&CRVuhvvs{?Nd6g$97QNUa; zbbzzlZ0Fi}Di12vYMttSYy(zk=i52xrpisa*e%dUHLB5ie{x#sflj0Ku}yV*pl}M# zs?}PlR;m}kX}+EB7NEM=gSuXwrf3S-;riHav>L4%1=Zk)sq7Y*8k%CVjTVDb`CdiB z6^%@AFag2GuS!@F?gU3A#IItb2wTEJhS4#V5F15@5jHX`8WHnFSCBDOh>j^a=rG0- z^CyL(D;O7J;hagKR45r$^Kg!4L@GqaB%=gh&C`sid8km#mvF^A(Fi6`^9jC$CFMxC zz$?J7B5a6RC~&HT=&*u~ut9|<<|AXsHB_kNDA?#QbPFbh7+1-`Sd&7DKq^%8FfPsk zm21ctsDO@`FXlhhlN~|{`A7sC^<|P6EHY~f+kzd zBg2ak$30(kebXN&gJjroZ#C|Z`;zVu8FUA{sa1$Q0e8q9Sd1)fEN;3}o&=yFPhc&$ zwBd*^Zmxybg8q;r?uwI1U&J3;zwe5>Q)F^|(-&F4?~8a6OB-Z(DY6*xMSUCVn`F=# zBE!HN^~c>Ih=X3>T#b7Io{&2PDxl*|EhhjAc|ZrcqmKAmcr~;Zbi~Q1EAES|h5aE{ zd^zDxfy#ytI+h}2m<&6C!50NC=w42^7*A2ifj&GzXf@=Ez=|?iSDeA2I?|}MO5IAg z^5yFXxEl2aGms?)gHw$;G4a>GzkEIK_b>YW^NaqEpZAmV{(1k$1)MKV`hYVTIGz81 ze7}Ek4tWTfEabm`|9&~xgLm+&W*~Oixg6}lI~dHs?>_^->NjJcGx$CYX5jamfuW%x N_}Bm6?*Hq%@h=^p)qns1 diff --git a/release/datafiles/icons/ops.curve.extrude_move.dat b/release/datafiles/icons/ops.curve.extrude_move.dat index a63fa1fa52517d0ca69adce3fa76a8a769d6a300..cbd0eb5e6208c2d7b663b3c0f468b5c4f5f89b10 100644 GIT binary patch delta 545 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 diff --git a/release/datafiles/icons/ops.pose.push.dat b/release/datafiles/icons/ops.pose.push.dat index e11f1d542546a93993eb0499da32815800c5639f..2ab36223c9674b6ac31c220f8457684b35049170 100644 GIT binary patch literal 2204 zcmeH_K~LIX7{~n(`vi7Fqcss{FoA5wjZ80yamlg}w3)9~m(r6GI2+ zs5xR0jBrE1F`Kw3+ZC7YRM)gF+d_svg%jHTNliR1Dg|)2ClMq#0U3WW790zjg76h| zCqQjcTcew!8x(t+F+s+dah48DB4UDt2q8Ub>A=KbYIMWI%RNt2Y#re!1dQ4gV$EW+1+f@0YL3blL9a4}T{BL2bxou!UOaJ2JKn zf1BytSS+!K(*_3r518Ta_@HGwffhPcrBkWAr@zyaIEfRV6ZM3atmf35nm^fx0541B z!%r!k!h1Ik7zr(>5-OER4|AGQP~MlMl2jHe>1tX_*TkAw&(yQ^Y%QndwfyOkDy#BI z@fh-=QZ3t z2gg6>5C>-+!SfZz@f`1kcgQ+g=MK25XJ_2On=|g}`ue&*Ji|K}?!a&dhCA?ocHpP< Ir~j|dU)^}sRsaA1 literal 2834 zcmeHF!Bg6J6!wqUzW`7XSzE2EGqh7jYtf6%cH41V2f6KqivvMeSPf~|qh%dYOE;Th z7YSex1dUsQNk|}}U8cGbi^|36!Q&qH?7sAG*xNGSyx;G=@Atholb3Jy0n&AI)7540 zS%OyF8XaCAB^wcKwLwnoJYeiBB0dwI3vKi~)buBmB+rz%j7+md(7xy=0AUNj{Bv)( zH{28MA$o{zygSq#GA)~yOiRX~F<|f+yhgOwV@Azhv$xOJ=ZDkZ_oK-JoY&wpq9%_; z?R*QGxCI!4&jcDPu4e|H*=q?7zq#{fh`JRUcr~zLjePxb0C4-|U}P{d zw0b9MjSN6OMBOHD#YU)MP>zzLzl~5MvC-F%kt5U)Wd+q>WO)6X4W0Q?NA>!{+MmDZ zU;fwHNffYgys41NuWAhN>iv41Qb;w{AU{xb>Ui_x>jrtUqUn2zd|WwMQDg6;jYxy6 zQ)*0GJ>G1<4&fcP2tAQWcH&@s|8CZ{W6Ri5cjBs;!8R+!qKI#e26%n5c^ODZb^3R0k;u-qM18}$8m+rQwjb1EWVCSJzLVKa%+OoEE z8r1L8;8_?r{5;em&cbc9?Yj(o=|G!{pFAyh)8AZdxi$PW(Da{&&cYhrMlS=p*II7f za~j_C=eT@1&(pPSB?0(deXGXhxU^N-s=O5wV!RfYw<-w**cuqKmQZpcBV}ah;vp+# zOF52#$cZ^IBkL35HC?||*%p8o6AFElDl?^ovMnU}Bu^hPCAPrs9p>30TR6;%yF#Ad ztES~0iIM4Qs+z7OrKC&?$qJmnq$Q?w@W%nDi--AlS+@8tTVnXV5->6?K~_!+pyV>; zw65p(*rL&8oEdZ&U0*qjGgq#wnZF%ZF3oW@gOLG@z#tX~xYsa@#7Gy^fCXX!+r>Wr mP{(#-b?o!?_4Q3BIy>lipyPp#2Ra`3zk1*z|If{T9sdGWy~>^d diff --git a/release/datafiles/icons/ops.pose.relax.dat b/release/datafiles/icons/ops.pose.relax.dat index 63158340e152dd78f98708093a4e4ef7d10b9238..c3c8983eaa58fd5c535213ba72b416bf886725cd 100644 GIT binary patch literal 1106 zcmeH_u};H442Js=jLOJ_pX9Ud+P@g|{a{d;LYFF|m=YL4NIo}Q<4#qu!HpKEGL?De zHJALvOS3cu6EDTmYHI7uG|oPD#{Q~WXchoDqlEL0R(UkA^JSxAqnVQ|3?ooq>uvkg&{dT zkoWD>n`)qe7FuknHSV=9uoYg_P7nv3)9{vSa+_$ek)23~UhYN5#>^HDU(blhBUib?6&@OHsILuWE(iwV42PU^7=eYhuq8)X+R~Ra;qwpFKunBbZt0GQ z5zkKeUbZy-9^RqC3Tv!It!iD-j^3!yh0awjIikQlPq1ZQQOUluvcLj&P;&NQta1EO z+VGM|Kj=HBx*weAzS9Ja^QD{MLpM&ieB3NHT=|06hfTN)mrvYt@(bYNbd;m2#+w= zAlD!lKUXhTFAq0w=Md)zwGJZu3fru3DDBjdpGRavS-USppvz_fJ%VU zYnN^V!ab`&;y|(0lVun~cyiTFcNZD8oiWJoIx&f9kx;JM`F4;kn>W>&JPFkd(I4iD%5+qg;rxp)s z@sNW9N27TsS(6#U8%>7?4?=}q_9yKB=-#({Zr|tge0hvlH*c!6CuDnive`(2As8CS zrfkAQe;HNSdUHm@ncxBuJ7tK1_W~1rg!n2t&shY*Gw%d=YQZ z8}uEL1W8byFe2tbzi|Wk*k13uM?q|w$qz``$ zRfIAckH#_pGLXkZMKUBfM1$oSu*Q}?GfZegV~ShK6hHt`54A>P>?@LXr`;J6_O0=Q z`k-363E!Gfn_+dRVoAHh@q>yVp{p$Xh*jCm{Kn_^ytBN`Zt~8Wo7-*fwf!}BFVOaP zef_v_)C)*yG1-qR*};jF)(aq~WUULeq!$(ycxhcMD$CaVYSnnWUbZ?*Zq8d}$Xnbz zud#X=o`Ry1*HVKs=@dl8Og}ZCghVeYdOD#lC3s$U_W6URtG>hT^IPW*?!%YcmuuhA zs`7SzgLiVfC+^e~pdtG1K-wOywZGS&5CWRv@Jvb4QN*3e>Cwf6Gft+;#FV)hb zGQWbCi^{68Y^@r9zCK=emdzD6FGE)6t-MxLSp5{7Nkt_!$n?*osF>(w`jimrCVHOE rK{M1vt6cSc-c@&SJM7l^4(s41zt{e*-F{mCH@UIDvroR+U#$NJuEr=> diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 6d44ca95f03..d5019d1b5d8 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -45,7 +45,6 @@ def generate_from_brushes_tool_slots_ex( brush_category_attr, brush_category_layout, # Optional - icon_fn=None, tooldef_keywords={}, ): # Categories @@ -55,18 +54,12 @@ def generate_from_brushes_tool_slots_ex( if brush is None: continue category = getattr(brush, brush_category_attr) - - if icon_fn is not None: - icon_id = icon_fn(brush) - else: - icon_id = category.lower() - name = brush.name brush_categories.setdefault(category, []).append( ToolDef.from_dict( dict( text=name, - icon=icon_prefix + icon_id, + icon=icon_prefix + category.lower(), data_block=name, **tooldef_keywords, ) @@ -1385,23 +1378,9 @@ class _defs_gpencil_paint: def draw_settings(context, layout, tool): _defs_gpencil_paint.draw_settings_common(context, layout, tool) - def icon_fn(brush): - return { - 'PENCIL': 'draw_pencil', - 'PEN': 'draw_pen', - 'INK': 'draw_ink', - 'INKNOISE': 'draw_noise', - 'BLOCK': 'draw_block', - 'MARKER': 'draw_marker', - 'FILL': 'draw_fill', - 'SOFT': 'draw.eraser_soft', - 'HARD': 'draw.eraser_hard', - 'STROKE': 'draw.eraser_stroke', - }[brush.gpencil_settings.gp_icon] - return generate_from_brushes_tool_slots_ex( context, context.tool_settings.gpencil_paint, - icon_prefix="brush.gpencil.", + icon_prefix="brush.gpencil_draw.", brush_category_attr="gpencil_tool", brush_category_layout=( ('DRAW',), @@ -1412,11 +1391,9 @@ class _defs_gpencil_paint: operator="gpencil.draw", draw_settings=draw_settings, ), - icon_fn=icon_fn, ) - class _defs_gpencil_edit: @ToolDef.from_fn def bend(): diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index d4974b24034..16c01b54497 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -605,16 +605,9 @@ set(ICON_NAMES # This section is maintained by the updating script, keep BEGIN/END comments. set_property(GLOBAL PROPERTY ICON_GEOM_NAMES # BEGIN ICON_GEOM_NAMES - brush.gpencil.draw.eraser_hard - brush.gpencil.draw.eraser_soft - brush.gpencil.draw.eraser_stroke - brush.gpencil.draw_block - brush.gpencil.draw_fill - brush.gpencil.draw_ink - brush.gpencil.draw_marker - brush.gpencil.draw_noise - brush.gpencil.draw_pen - brush.gpencil.draw_pencil + brush.gpencil_draw.draw + brush.gpencil_draw.erase + brush.gpencil_draw.fill brush.paint_texture.airbrush brush.paint_texture.clone brush.paint_texture.draw