From 0f20696846b0b84abaf7cc8e024c67674f453cd8 Mon Sep 17 00:00:00 2001 From: William Reynish Date: Mon, 11 Mar 2019 23:22:41 +0100 Subject: [PATCH] Icons: Add Links Cut icon to Node Editor, plus other tweaks - Tweaks to Paint Mode Fill and Sample tool icons - Tweaks to GP Add Primitive icons --- .../icons/brush.gpencil_draw.erase.dat | Bin 1070 -> 1052 bytes .../icons/brush.gpencil_draw.fill.dat | Bin 2276 -> 2276 bytes .../icons/brush.paint_texture.clone.dat | Bin 764 -> 764 bytes .../icons/brush.paint_texture.draw.dat | Bin 2258 -> 3680 bytes .../icons/brush.paint_texture.fill.dat | Bin 2276 -> 2276 bytes .../icons/brush.paint_texture.mask.dat | Bin 476 -> 476 bytes .../icons/brush.paint_texture.smear.dat | Bin 1700 -> 1700 bytes .../icons/ops.gpencil.extrude_move.dat | Bin 5390 -> 5426 bytes .../icons/ops.gpencil.primitive_arc.dat | Bin 584 -> 1142 bytes .../icons/ops.gpencil.primitive_box.dat | Bin 152 -> 332 bytes .../icons/ops.gpencil.primitive_circle.dat | Bin 1160 -> 1340 bytes .../icons/ops.gpencil.primitive_curve.dat | Bin 764 -> 1196 bytes .../icons/ops.gpencil.primitive_line.dat | Bin 44 -> 440 bytes .../icons/ops.gpencil.stroke_cutter.dat | Bin 1934 -> 1916 bytes .../datafiles/icons/ops.node.links_cut.dat | Bin 0 -> 1628 bytes .../datafiles/icons/ops.paint.weight_fill.dat | Bin 2276 -> 2276 bytes .../icons/ops.paint.weight_sample.dat | Bin 1574 -> 1574 bytes .../icons/ops.paint.weight_sample_group.dat | Bin 1610 -> 1610 bytes .../startup/bl_ui/space_toolsystem_toolbar.py | 2 +- .../blender/editors/datafiles/CMakeLists.txt | 1 + 20 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 release/datafiles/icons/ops.node.links_cut.dat diff --git a/release/datafiles/icons/brush.gpencil_draw.erase.dat b/release/datafiles/icons/brush.gpencil_draw.erase.dat index 7a6b69d78dc8e42bc7ea6e9c7b99b40260b2e84c..5b96035c9b88d0ad92b6ce97a04d6730f3275d68 100644 GIT binary patch delta 269 zcmWm6&5D9h7=U5tXVDdzQ6M4eaS%V{gHvV)%O6DR$N{%On^vcxkg06ZHOyviX6~jL zckkwTzXy-Oo*JM$pNe984xwS{uL9H;<3!8BA)djItnJv%%(;me(a<3b+v$}Ew3g-^ zBRjU173YNGAY&@)hHxC$7eE_rX->b#Zwygk*D-)YAL rCR(Ky&{mRPibN|Qhr{SN5ojU}F~Z2r>^KRFSvmW8f3aS_=-clfC8T1p delta 272 zcmWm6&u)S+0Dy6}T|Df85Tgl!qQJ~7ZHdaC2n2{#+k~qJmw2lVH4=OA8J6sA_9(l# zar-X6@80?9?0n;0c{~)wn%IsXq}~D{eb!I39NNwpgk+dmiCdU+Kv3idwiA-G(KsA~ z*qo!tN#OQ;(|Ee^Ye{%N<<7 zN^Q};$FYoWnP8)Qn7PGaa5gw@90@tzb~mU}0kI~2Fa}5u$pVE0>4LT9LQiYKPV1Tp zCZ{syIMJwD!V49wDHE-PIo$US1CDF<$&VZmKR^+R+`>w}f8U<3A5X7W^X2Cc!)Rs# diff --git a/release/datafiles/icons/brush.gpencil_draw.fill.dat b/release/datafiles/icons/brush.gpencil_draw.fill.dat index 1a7b71eb975837eafce14d770525877568f0eb48..869e65b2fbf0fd58f51b85590dba2263457165ed 100644 GIT binary patch delta 38 ucmaDN_(YH+%-Nse|9=LCjePHz*rp`zY|C%kT)<|+wAqGr1@mMDW*z_@`VDsg delta 33 pcmaDN_(YH|%-Nse|9=LCsmZ%K3OY7&ykpuNz~;cT*?@HgGXUiE4441_ diff --git a/release/datafiles/icons/brush.paint_texture.clone.dat b/release/datafiles/icons/brush.paint_texture.clone.dat index 4ea56d1450a5027321de42a5b507380e47419d6d..5d94ab45ada8a2aa87e14b5ad3abdbd8249d1399 100644 GIT binary patch delta 23 fcmeyv`iFJG5}rez?g_S@hdg&AxF>Af;KKv}ec}o9 delta 23 dcmeyv`iFJG5*{;;ZAqRS-pjN8~Z>#;6jo~*|z003fm2Y3Jg delta 12 UcmaDLb4hT+H>S-OSnjX_04ZAq@Bjb+ diff --git a/release/datafiles/icons/brush.paint_texture.fill.dat b/release/datafiles/icons/brush.paint_texture.fill.dat index 1a7b71eb975837eafce14d770525877568f0eb48..869e65b2fbf0fd58f51b85590dba2263457165ed 100644 GIT binary patch delta 38 ucmaDN_(YH+%-Nse|9=LCjePHz*rp`zY|C%kT)<|+wAqGr1@mMDW*z_@`VDsg delta 33 pcmaDN_(YH|%-Nse|9=LCsmZ%K3OY7&ykpuNz~;cT*?@HgGXUiE4441_ diff --git a/release/datafiles/icons/brush.paint_texture.mask.dat b/release/datafiles/icons/brush.paint_texture.mask.dat index 29feb1dccb92e0e065acaec95e470de60e0f0364..cea902261fa3161d31972583f4c20daa89fd4e44 100644 GIT binary patch literal 476 zcmd_gF$#n*5QX8~&BAiKy@N%%kS35~U|>NI1rbElML|)6)`2u3XYm}_Vb8GLGW=6~ zyl3)YF*1g5!G#x|Il`Hn3c*x+gRnPChp=?hh%k-Aj4;gYiqNk0hEQ+CflwSTgFw-j z-r3-#a7wEnoOMbHZKao9TW6&pBM-D9SK9LAo$)M9C_3J!Jqa1f*ErdI-|?R+%QF6= E5B^wXa{vGU literal 476 zcmd_gF$#k~5QSmyW@VKwcd(mkw|ihQm_`v1L_`He4I)}?w_AA@&#@VDhIC>0r}%i! z@DX?)1dJ1BawbR0IMO|1?AcZ_wsNT%OFg!XvF!&&KQt4gnW~vl&H2j6*VmgN$yd&r z%PF!N`XXzrRs^G*axm5?5);2O{muzD8pAefxi^C<_0JKE2gs Avj6}9 diff --git a/release/datafiles/icons/brush.paint_texture.smear.dat b/release/datafiles/icons/brush.paint_texture.smear.dat index 36958641266c4f9c6b762373437a2fa2e271b826..694655477dbcb6c1b0ab7a3a6942eb43edefb4c3 100644 GIT binary patch delta 38 ucmZ3&yM&h`%-Nse|9=LCjsNTzCvtq-Y`{{&G}(cLW3vO(3&zO-Oe_Ejo($0d delta 39 vcmZ3&yM&h`%-Nse|9=LC$!?6_Hgec8Za%>BgmLl(7LLshOchL%1DIF<7F`WI diff --git a/release/datafiles/icons/ops.gpencil.extrude_move.dat b/release/datafiles/icons/ops.gpencil.extrude_move.dat index 755e0abd4d47c112fb61c2896a2753aaeeab74b7..92e50c9e77e41144af52ef7f464225e6ff6d4fea 100644 GIT binary patch literal 5426 zcmeI#Yfl<^8wT)x7~758XuBiTxPS@>9ylW)ARsUx=QGF*0x}>Vh#(?L@c?pASHMj) zebGbGY+}2y+NbS@=;!dcd9m3Kv1IbUt~>K$W-|HBOh(G!KY4t7^5pj0=kI_2*nM97 zwJ?+$&JPuaGDE~bW`G#No)QE2uF`17a76+vP&bkPCJ|=*k-QdRr zQC5n#!H+Z3+!Qa(NOP0ZX-1B-#mUll*f~y~zRTWW@6t-_U3Q6fz%H@N^fLQ^U7=Sv zW%e=Sh*RNI8OPisPJOz{JLWc7HGY+MHgn3a@y}=Lf>Zt<^L1feaLH+i>cTd!vCt58 zMU91ypet^QyP_*;Q_>Y*$(qtDX;;x)ypna5O<7mbQ8ndVWoNkoQ(N0u>MUQPb!A(7 zp|7hh(R0J8`a*wZtf|ipO;c_8%-AqjHBHm0UP4eMiw*Fzh)B&iqQzx#QY47MwZvmI)?L+MIJ|y(!DK zC*w<6v);6S!=CYN24c>%KZOyl%|H@g_oT37Fyc$%iBLF@3?{-Mm=ck-wL~}(U5g|l ziD)RkM&t*2vLl<}B#{Q&pqm)Nhq0&lu;-=gndhYyF%4P~JxTjqPg0L5UZ}_9zl#wu z6;vZ2dYm`PnPyVw#^+{eH0T)?dxFVgGkD}V29G8h=h8$|pn6I&A$tXjxPMG@grWUkA#i*C;X#95;nOy78(ss z2F4>}p(%_U9gj?5beu}iaR%sS;M1Uc8fOKWV0#9i1>19=8&*#@&c%cT7vl#OqWpkx zRT>elF8Ji31)s#L3`)F}+v#;mX{dR4YXhj?|#A$E%}nOo%J2cIk24v-C&!x+p`V2OSCfm0Bl!4cZGh;sBn%MRnT2!)TfWR z_30+7%4@RDW@`Mine*9Gunn#Sf6QNU>cUG7xE8f}9YJHED{6`%#Z5_547Ncx*j{Y* zY(s->c~jO=H55%b*j{QV+S`hNb>)TrR9#n{8*1uPHP~LRshg&%rncNLpJ=L@ zQ&0_UInqK~E4m{sh}Knfhqf~MS_h)hG76&g`zVOk@99Cbp{Or{>Vl!*+&1P{c3fMg zZDY=zHbZ+-mb5wROp^RTD)Ru9D!L^zos z5^>0QA_1A$NQRRe$v8X{@l7J#dorTw$YvpzD{t-Z6$*#B@vb*FvZ>b!e%^S*t3`|-o)oA-C0{(AWE`LBn& zPq*LhK0Vy^j`#Kc{`=SauU{Yj*Xv&1{rLOG?YDdQX2F@@Tx xKK`?Q{`~paU;TT~H_$iGH_$iGH_$iGH_$iGH}Kyx@XtR%zyJL|`mf!K{{sz;;9>v( literal 5390 zcmeI#Yfst=7zgluAeY5#x>Su$V1Qh-fFKBnwQ`37<=S$QJ4Nm{1py0A1>U$N%eHJM z(Hx_@eUE((&%=w8^C1ptp8x+zU$jZ{YnrOKThE@Jo;`c`_3-oYKEIHd%g-eisOO0} zdeQTOdhUH~oAE)rfvk%~d11H`{#0ikd6i*o19UDw=Lmo=6}N zqnu5iXhX3k=WGg8tI9PwU$dfFRq}Mpx)lxAuw+=)aSsrD$-prqIOlNPikLX&bq8Wy zx2_Y2W8J}VBd&FVLn0oIo8v`%9Fpr_3UIu{lsF}!(WErBNz0RH5~Y+0c~Va8#FYs}Xg3BO)J35E z23i-<_^^8cM*^w%$rneGGXlYuJP{t)$d0LSaF|w?j5i+vO1|uw?$FhR3 zf|k&-poUh^s-S_^(1xIiHqe&f1Z|>iVOw^Bo(Vg$wyd|&m3L&Us3-5r2jae>C%=%K zZ}%0KQdW7seT@!Ota2nD>L&Uz zHqcKDe8b*g#W_JJDcxgGuuFMzKK6Yst+WH3Y6}Y$W*llae-YYq8ZRpIVQv#rTu}Tni{6%})wx5x54`;95*ez_oyA6cNYalSY#e>;#tBt^|Mw7#C zG?{V2V#cleZj*K2zDMHrJwofl2(4Qk*mJ8%6{RCpenoiKuL#Pb>Y$9?I#SVFQE5UM zmBuA$MO=~;W#vf`XqGX;W7#wd;JP3z3o4+x3a&vlxNZnq;JPJf3r|4x8MraIG52$J>J)u&stv4>h1$Gu#E; z+Tm2Uey9W8h5Tfd-yqc z?&5t%=MWk^Lpx86Z6jDVof^TisRfoBrltujn;WJ&c&?ejvZZ3FdWzPvr3{{n))L9s zp}jc=V=wqJ&YUCfPq{KqCXjTeT)AMJOuDnwkuOeW>6rh>mkCFMF@Gi!p`$@i4V{jK zr>^7Ssq1(;5lNL7iVIWM`Gx#kX$~5)^1Su}j``ADZNB=l@@m?ZSCLdY5zVF(8OTf` zlY&fT(vazN7S3l=@MffPNyua_!A#$hI1|fNO2w1oX1!AF6i-_9Mz`AOG*8(^x8Lr) zJ7q6=!*TE3&3HH-4L^Mt-Q0|CzrFwb>BIfqm%H0<55I2V3z91{C8kj+)hor5dZksb zc3SmLv(fD|`|VS<-@fSe-d*%Y!{PX5Jh~ZI&ai%cV5EEJeVp-_Y@7Rqp@T&$Fi zo70|Vu9hq3YT0V8eDvG$mH24+ijRqp#7Am$^!wPF>kNr>YpZ=XcfBrnp oX7&tb24)6k24)6k24)6k24)6k2L2xg{{0V_^?(0F|A%Ms4=di!8vpwDruZ?UM8Sw7u_cJI}-@P4OXHKTP-5VR|%N zqVB{^V~CCax~8KtL>Q{OuL!)#k=nAi-+ZzzU41Lm;MTL<*z~4J^>~E26Xd) zybnm~nF7KQA&es!3E@GTmxC;S$+lmy z%MS1QUcK}Fgsm%v#Z5YfL)KMOI=Y45I;G#nO*rV0nX3;ocMGQ!JTc&}VxULrgVh+D zHW*v*_$$dBq^-P_S&cR*oB$gfP$WkHI4@{USYI2L)$L_bcGH&$f zl9;)fUlO+vJmoG1VxZjhh}C$Du^F4U1drr)$8X^vu^RPp697=VBgw%T!39-Q-6LqN K&-Ksm9=rjh1CSB` diff --git a/release/datafiles/icons/ops.gpencil.primitive_box.dat b/release/datafiles/icons/ops.gpencil.primitive_box.dat index 80525d8d929971b82b9fb02cb9a50eba30f674f6..b2f6d468e047515bc2ffa0bc7233aae6a57b3531 100644 GIT binary patch literal 332 zcmdtXF%7^l3`Eh;h}6jt!oVtkZq4L13`)jxq>M#i2H{{SQ&^Vd{(C!B^H$`)pb^hPKD6b37uXk>MC(Uu63_J F-UBL$;nx5F literal 152 zcmWG@_GkG2pMl}L(Xo@qto4m7PU>IQzkKZE`OD{xEP(v;M(2S%ptv~uw_5W#!0YMsOA^-pY diff --git a/release/datafiles/icons/ops.gpencil.primitive_circle.dat b/release/datafiles/icons/ops.gpencil.primitive_circle.dat index 3bf346eaada151a3724b202a3fe8fe6dfdccd71b..f9a60f1507ed21b99b0fd640e2ac0ca28f01c968 100644 GIT binary patch literal 1340 zcmeH_v8tm`6h-qLaSGuPB$b%T#zJ2c6z&j$BS^$f5G#uzSfsPKSlI}IofrfK0}9G3 zv`QnS5G#=o@PXtrGI!=9rb=-*?6aD^5Bt~W&&BJtSg`fxwyD|M=KJ4{*_y4T8`8HQ zHM;*LNU`6D*PEC{TtXaC#P7$aK3giKa3V97z{t&|^t31b?!f=;z#pf&nBV{a literal 1160 zcmeH_vC5-B0EF`{!5|VPVPOl41vvx@K?J!<*uq+rz|{-BfGE}$3zl*sSXc;xg2jR+ zXb?%rtK@u-`->@Ns&9t*{mVFfzlXy;eg#{C6xjj>qg%3MI#e~J^u>~~$`(zeLvJP@ z_gy!vYCD(5&=&30o85Olv|Txoi_4RfKH)v3+qc`V6 z-LxIKcvqL#Cv(7KI_5(;?fe&VLY>-}LpY}+T~iodBOX+8p*G|h&e1zZDWsy10V)@@ zmZK7Ki4+6cTea3I$Kbp-U`}r_gY%`^dFN-&f&~m5>Gs&&<^yBj-1+nU`~A_+2LI~^ F{sG-}9aI1S diff --git a/release/datafiles/icons/ops.gpencil.primitive_curve.dat b/release/datafiles/icons/ops.gpencil.primitive_curve.dat index 45a72c145ab41df02a8a63756f63dc9a21c02683..6bc585a94fba71f014ab21f9af3d0595e27628be 100644 GIT binary patch literal 1196 zcmeH_Ppbi86vll9y4l=?>?|zU$ig(Qd-G0dnuW$qO-*SQC{oiE3oNiulZ|E}3rbR` zYx5>kW2J1cl9aj0zxf*OVRyfSPN#F8=eKz}o#+Q=x!)}oq0c|* zt9Kpz2LXl7z;*8c0sjIH6gcBRZps;UVIOjH9+t*F-p?~EEzlyzGZIclMJ~h2LNc0< zl;W~biPaOOctcdv^+ZeR%4)iw8Wp%m1n6W4$QeeFGeD16Ku;Gym@a63zNC3hViZmiWkD0=wYoCa zs;TR?sk@frx>mUHy>Jt654(7q1;>3BoTEHBM=-vgU|gm!FVm*DUz(!5)v&$2AJ6LZ TYJPp3=#P5?tt-0!{@#NhtcnXm diff --git a/release/datafiles/icons/ops.gpencil.primitive_line.dat b/release/datafiles/icons/ops.gpencil.primitive_line.dat index 8c64bb59804d20b60e383ef66534ddf55da55369..67bce8b16e8dc04eb5352781df2f909bb5862bf3 100644 GIT binary patch literal 440 zcmeIu!41P83_OLTXNIfW!jqfLM$Hkc#2(^e(@?+xoM* zp7uvK&&~m|fN%pf*MMF;a)1mWN}|FeMi~V%7g8%5{*?$;f_UM;8FG|}i4vW+g>7wN m`$HPi5alnJVS*W4`iZokI;Ev{y1S5W3S@fT7uD-gy{j)r5-~sk delta 164 zcmW;EK?=e!5J1stx1u1lw@Iax;K0-dOFOF`Bc#)n5Mo>?Zaj&20gvPXggUr*yU+iw z@0$}7y*^E3Z)g012tsPdhjX~p*ZiN z7G>12yi`$#y@&rn9%xA(z3WE9-Pp3(a?8ibu;Ig4yV{{O&+8(6yqBxjE&ZfFxxG0b diff --git a/release/datafiles/icons/ops.node.links_cut.dat b/release/datafiles/icons/ops.node.links_cut.dat new file mode 100644 index 0000000000000000000000000000000000000000..dbe79cb96610e00198c5fa4be19090a1f33e3f5f GIT binary patch literal 1628 zcmeH_!HVKQ6h-|EzeX2sT&M$fa2mwe3W`c3rh^2b7Xd*KQ6nu1ijoR7&{h&O34}^W zAwm(qM3^6#wNv&V%z9kh_wHT1#XY=I=11awPb5(LxBN>^wkL8@W}c;Fd%=?XGS*d1 z0c<*4Pz_(t71|_?D;MxC?+=LNe_-X(!vj)6HLH4D#v8J|ilI!q(Py-br?d`gRv8Lr zABuJzv`_;X?g3ej$b4Jhfi+s`2eh{!+*>;U;TmaRrBCT1WcTI-YCyx|%ZM0M55CSr zJoDzhK{sRK-^#7)v6s`jS5E4geTQ%si-?{bdn zNS<^uvEf=yHLTFrv#QxC_r*>*887?TUf#=kc{`;#eW(BhsM=T`>l64O!26GzdekIb zz&X4-AU!Pk%0&!&xP;2EW-a3t*$^>QE;9X$R%991L4&aoOcC^99klfpBLI#EBm%)~ zp&i(wH98=0+*^BV%kmm6O$|)x__7F>=E7zS@FE;v47!W-V2D*`<{5N*-H;h;K0m3> z1b%byC2vHAc<$?g;hR{9JER*4apT%#92D@T6w|F{o@+IKvYF>{g<`sx&J}Xm5~?0~ oSG4<3I`vu4Z$7@^R>OK!p?^B%`@iURyWO99GI;*L|NR4h0pmRlU;qFB literal 0 HcmV?d00001 diff --git a/release/datafiles/icons/ops.paint.weight_fill.dat b/release/datafiles/icons/ops.paint.weight_fill.dat index 1a7b71eb975837eafce14d770525877568f0eb48..869e65b2fbf0fd58f51b85590dba2263457165ed 100644 GIT binary patch delta 38 ucmaDN_(YH+%-Nse|9=LCjePHz*rp`zY|C%kT)<|+wAqGr1@mMDW*z_@`VDsg delta 33 pcmaDN_(YH|%-Nse|9=LCsmZ%K3OY7&ykpuNz~;cT*?@HgGXUiE4441_ diff --git a/release/datafiles/icons/ops.paint.weight_sample.dat b/release/datafiles/icons/ops.paint.weight_sample.dat index 01d4194a74795a8439ff7ee24c97b3bcfcc02bbe..423365f5a554e30ae15ed6419fa8aba6947971e6 100644 GIT binary patch delta 21 dcmZ3+vy5kh5Yyy37MsmVOd3p^%UCur0su-E23Y_A delta 21 dcmZ3+vy5kh5YuKqCJm;^aZEOw%UCur0su&~24esK diff --git a/release/datafiles/icons/ops.paint.weight_sample_group.dat b/release/datafiles/icons/ops.paint.weight_sample_group.dat index 78600946d6752bc8d9cf7fe5ec86ba358554f3c4..b37eb59ad23aab8ebf53b53ff478c2c7867bf510 100644 GIT binary patch delta 16 YcmX@bbBbp}9LwfeEE^anuVb+R06BC9LI3~& delta 16 XcmX@bbBbp}9Lr=qCY#N1EE^aBGxG(6 diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 5940a3f70d7..a7f555288ad 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1387,7 +1387,7 @@ class _defs_node_edit: def links_cut(): return dict( text="Links Cut", - icon="ops.mesh.knife_tool", + icon="ops.node.links_cut", widget=None, keymap="Node Tool: Links Cut", ) diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 325a369ef7e..876af10f884 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -723,6 +723,7 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES ops.mesh.spin ops.mesh.spin.duplicate ops.mesh.vertices_smooth + ops.node.links_cut ops.paint.vertex_color_fill ops.paint.weight_fill ops.paint.weight_gradient