From d2ad256326736c8a4c746163f9b27491d8a6e95a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 24 Aug 2018 12:54:48 +0200 Subject: [PATCH] UI: add dedicated icon IDs for decorators, tool settings, shaderfx, overlays. The preset and decorator icons were updated to be monochrome and draw in the same color as text. Other icons are unchanged, having them as separate icon IDs prepares for an artist to make them. --- release/datafiles/blender_icons.svg | 1233 +++++++++-------- .../blender_icons16/icon16_decorate.dat | Bin 0 -> 1048 bytes .../icon16_decorate_animate.dat | Bin 0 -> 1048 bytes .../icon16_decorate_driver.dat | Bin 0 -> 1048 bytes .../icon16_decorate_keyframe.dat | Bin 0 -> 1048 bytes .../icon16_decorate_linked.dat | Bin 0 -> 1048 bytes .../icon16_decorate_locked.dat | Bin 0 -> 1048 bytes .../icon16_decorate_override.dat | Bin 0 -> 1048 bytes .../icon16_decorate_unlocked.dat | Bin 0 -> 1048 bytes .../blender_icons16/icon16_overlay.dat | Bin 0 -> 1048 bytes .../blender_icons16/icon16_preset.dat | Bin 1048 -> 1048 bytes .../blender_icons16/icon16_shaderfx.dat | Bin 0 -> 1048 bytes .../blender_icons16/icon16_tool_settings.dat | Bin 0 -> 1048 bytes .../blender_icons32/icon32_decorate.dat | Bin 0 -> 4120 bytes .../icon32_decorate_animate.dat | Bin 0 -> 4120 bytes .../icon32_decorate_driver.dat | Bin 0 -> 4120 bytes .../icon32_decorate_keyframe.dat | Bin 0 -> 4120 bytes .../icon32_decorate_linked.dat | Bin 0 -> 4120 bytes .../icon32_decorate_locked.dat | Bin 0 -> 4120 bytes .../icon32_decorate_override.dat | Bin 0 -> 4120 bytes .../icon32_decorate_unlocked.dat | Bin 0 -> 4120 bytes .../blender_icons32/icon32_overlay.dat | Bin 0 -> 4120 bytes .../blender_icons32/icon32_preset.dat | Bin 4120 -> 4120 bytes .../blender_icons32/icon32_shaderfx.dat | Bin 0 -> 4120 bytes .../blender_icons32/icon32_tool_settings.dat | Bin 0 -> 4120 bytes release/scripts/startup/bl_ui/space_view3d.py | 2 +- source/blender/editors/include/UI_icons.h | 35 +- .../editors/interface/interface_anim.c | 10 +- .../editors/space_view3d/view3d_buttons.c | 5 + source/blender/makesrna/intern/rna_space.c | 4 +- 30 files changed, 722 insertions(+), 567 deletions(-) create mode 100644 release/datafiles/blender_icons16/icon16_decorate.dat create mode 100644 release/datafiles/blender_icons16/icon16_decorate_animate.dat create mode 100644 release/datafiles/blender_icons16/icon16_decorate_driver.dat create mode 100644 release/datafiles/blender_icons16/icon16_decorate_keyframe.dat create mode 100644 release/datafiles/blender_icons16/icon16_decorate_linked.dat create mode 100644 release/datafiles/blender_icons16/icon16_decorate_locked.dat create mode 100644 release/datafiles/blender_icons16/icon16_decorate_override.dat create mode 100644 release/datafiles/blender_icons16/icon16_decorate_unlocked.dat create mode 100644 release/datafiles/blender_icons16/icon16_overlay.dat create mode 100644 release/datafiles/blender_icons16/icon16_shaderfx.dat create mode 100644 release/datafiles/blender_icons16/icon16_tool_settings.dat create mode 100644 release/datafiles/blender_icons32/icon32_decorate.dat create mode 100644 release/datafiles/blender_icons32/icon32_decorate_animate.dat create mode 100644 release/datafiles/blender_icons32/icon32_decorate_driver.dat create mode 100644 release/datafiles/blender_icons32/icon32_decorate_keyframe.dat create mode 100644 release/datafiles/blender_icons32/icon32_decorate_linked.dat create mode 100644 release/datafiles/blender_icons32/icon32_decorate_locked.dat create mode 100644 release/datafiles/blender_icons32/icon32_decorate_override.dat create mode 100644 release/datafiles/blender_icons32/icon32_decorate_unlocked.dat create mode 100644 release/datafiles/blender_icons32/icon32_overlay.dat create mode 100644 release/datafiles/blender_icons32/icon32_shaderfx.dat create mode 100644 release/datafiles/blender_icons32/icon32_tool_settings.dat diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index 4174c575e67..e0df177e36a 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -31693,94 +31693,6 @@ offset="1" id="stop32081" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -32205,6 +32001,162 @@ y1="238" x2="226.625" y2="251.71078" /> + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + _d?j#b|$ z59$Nt=iP~EMrxXEovHPMFWwdPMfA*@ynj~-c= XtbE`mNbhH>e3uCC|9#no`E~CT*Rjyu literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons16/icon16_decorate_driver.dat b/release/datafiles/blender_icons16/icon16_decorate_driver.dat new file mode 100644 index 0000000000000000000000000000000000000000..483ea2bfa130ee0caf39b31ceb8ace4b7d26b1a2 GIT binary patch literal 1048 zcmb8uPb)-G7zf}(QFgPMt*vA!DHDa!C=0gC+9yy}YKn!0h3u@QY*_LQl=up=^lu>x zS&rwFnU2$y5MVAF{(F=JoDd+P>{sG;2 RYxA6rPv0|o-<-T(Xh%rdK2iVx literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons16/icon16_decorate_linked.dat b/release/datafiles/blender_icons16/icon16_decorate_linked.dat new file mode 100644 index 0000000000000000000000000000000000000000..1980b63027f2a384e8e854561395e395e372891e GIT binary patch literal 1048 zcmWe&U|zs( zkXbu`m=UBF<`x)Dgnp3y()jF$nT1RP^*jM$qWq7n55@-S?Eqr3!yjf2G7U5joBu&+ tkEj%lLw_Mqd@?a+VABtBA5c7>7&CC`hni6gls^K*`0~%dC`v%IRM$6>g<;9YAQlE5GxPtS zWV5-5|{-H-)3H@s~=_n literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons16/icon16_decorate_override.dat b/release/datafiles/blender_icons16/icon16_decorate_override.dat new file mode 100644 index 0000000000000000000000000000000000000000..d8540da683d6136dd6a1a111dde0e9239c90d2ed GIT binary patch literal 1048 zcmWe&U|A)_XrSw0OI#Regw=6Li&O7tUx{Mp?X33 zLHIRL+yP_;5&Hf9{{6cEsOK({8JmG(6M=d;2t~w8er;10HAxTfOtL#1Lag|v7`^DTU1^}+>SR@dmrn|cP!{PeGU1MtBUR{#J2 literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons16/icon16_overlay.dat b/release/datafiles/blender_icons16/icon16_overlay.dat new file mode 100644 index 0000000000000000000000000000000000000000..a7ae9d89789d5ef0fbaa39a9836d6659c44264e6 GIT binary patch literal 1048 zcmZ8fUr5?f6xP&CLv6Zn5oBy@j*77w3=4Ybsn>c6B5=&8RbW(5P!ZDH!+h9SLC{Oj zz4lTR6aUSb>yOmZTIQc7Huaa4B$(Q2-w7Sjg^zRYz2`gkJNKLt7K>E^Xo0_M7OSIx z#nJ)y*Uilh7Z3qbK$f!-SOLJfAD`djjtxlW=H{Nu<#K&tVWEr7W~YG+kH_1UNF*P7 zdU~oTPo9&vIc{k~Lqi8*W9{wjYbuqBL40IjU?5ymQ*+YN((;wV;V=~y6>7v66XykE^78UG;NR+iGyStB)$)qKbNLb_XxGfru+SF=w2z+}u9Co#~wi?A^@n^&f0Y!0f z@tVu!3P8s%X!SQXHpX>2-NEGKq<3Os;&6O?+>5`7Q{I`G8LGq1<#PAHrM^7HpPf%n zPp9VR=jnaZ=;){q=ca5nYfhz7mWzuE%i!RkKNgGGW@l$T(3+&ac)i}z%gak8_{p7} zoj=#t*H+@?`Q%eQh%pZj5Btu}&Ti{*I2?!IXYpT;5c60h5;;kKCX;ajX8J$kA)kpr zI);XZ{PZ8Er>73|XAS!I!KL|6)k8Tve5p~MTdrn&!E}O{{XraKKIU56i#MlsfCXkKyxJ>!oO$Rc zcNRJIr*8Cp`rmVF{T=zqdENcd$E|*H9#Z=`uf|`>ljqg?OS$sA?*5$qZ}qwY-rbG- literal 1048 zcmWe&U|(N-4EjJiiiv@t0f?y#%z@^K;xSVYDCdGpUO+%#iLkKneO6Z16rdV5 zBy~*8%*+1uXF@5@Uuzpih(|5oyo&eN<9JV0+ zOk7-CE%x^IZ?@m@&g!7M}T^zfY^?k zoBIL}56=@xNy#U=y1GxCotC>+|`+yCe1=l=(~{kfW&+7l@$sYk$YcnFGL zV0=e_8~_Etl+7Rn#7aQy4h-vOyLRmY>j#?o5-1i2#GtSTr9py#pPzr-gb5S=_w@Aq z2Zq^2pavF#not$kgW|%^&+jWRJ*T5e5yfKyy5R)S?ngk?Ab*hzfZ-DWjGIP$8Ue+? B%&hAIh|)Sc?mB4?X6CM|t~-0twK6xUkTiV|L_~xrjKUCtiY_nG zgZPlQpnF1ukRTK-Bos+d&_j|!1w9nHh?=vzt?1Xk4->=SW#H#K=R4nb{&Qx=OhjgO z0x3k*44XNkE9__=w?OHqhWkA>DkbBf_B*=;zOBI{DzRT*fYmtgX_(F54GbOB^a!#!YN0%+Lx(?8@#Pxdcrs`= zoB41_Hle*HKRVRYpp5sO{rh3`=6dw!M_}qUFj$EBz9Kwqx1+bgnmB(XbE(mpwv_a^ ztz18wpL2;+;1bC1vQT4*h0c@;)Yn;8s2~~vh8?&TN{>~DDKD9)i`APPd&uh$Xs^>r zMs! hob6Syk!Cy2lfzy1*}3WMbeq+a?}z=wh6vt;f>>t-4Xtn6yIoSSy2#Sa3j|Cl~h@{+#JlG}A33h1@9jsFaFV#wc zL=k1dwrV1=EVhl%rJ&^HIuop>QS7>DZA~-Hz8S{FtcCr-mp5o}R)}nwgn7 zEGa2*O8m?E`ug1jNkX`~8c2+Db94XH($W%86a{#uPvT#xRI1&JiwlUKoIpGt2b!jj zx3{yf!DKQ~Mx&7#92{hOdwYMkx3_;c z7!2&t&=5N?Fp!>{oTPGjjYdQ6@9%@h;{mtZ4O3H7wApNCudc56zP>&NuVcf*!(xtm zGPAR@0`JM5uhZ#5M@L5@zqYm}^8Nk&V!d9kzwhYiU@aC4C+yeL)5AEO&If!$LqjMM ziHQ8_>MBf6Pe&UY8}HD|Juj`Bn;YI{vvJr*24@(}IbVi6i8BMQ*DLyWxm;kk+o|T} z=IinCagJdazOAi|>+bIU>2Nrr!C+9Bf7ZXOrKKeli^ag_^TEc(1}rZx!~Fa_AWJtj zHL>Y*n#UP46B85E%E}7t?d=KtC#nC}t*xyg;kyy|&CN{^dRSas1gxjES}l8ddCAw- z)-uA}*VotK;Nai^kG+zaOa=tuS&&Ml0R0?yb#JNUnRko-Rt3hV0XlIVxWJ=0ZH zRY~;nOX#DbqT=u=An%^Y=hWxtdF7AN=f%av-zqCBlNdkaQ@Kng`yu4$$CX?C2W<}9 AtN;K2 literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_decorate.dat b/release/datafiles/blender_icons32/icon32_decorate.dat new file mode 100644 index 0000000000000000000000000000000000000000..1ee25791fcb6067356ba884c13a678ac19c734b9 GIT binary patch literal 4120 zcmeH@p$fuK6o#)bF{lVe(}Kz9<5-pqK7qv-5DW&wL^KlsA7 zbN=t}=OKg~?wt@8@XmPYf*v)X2GoEWPy@yWVvIvr!WpixhKX_AHHN1TCwSGk@ji8h z8_o~5vbcGw1agX8hLn@)>Ob;73WA;-C5Q(X@Z!OP3NE<*iugT9!O+@SrvpMB zJgQ@=>b@{a>*rK?ZlY~{+j?lD?Rhw+m+%cM&w<^b?aF-Qmb!a9zIx4 zSLs3CJ`{AXHNIP^U4}PMxP$tyqZH)nJfA}06K&yK3t}PPA0b4t z@UgL?>-W?>Wii}y=AN6Ue$Cu--}iZD=FT}YHy#8*99px3U?3|9mUH=#2N_Tzk;u=0 zt(7I&b?^?0|8X2-R=_hzD^Or{;2w*}Y=H-mHlf&~y_FT24R8(89+X)%dMqNd9xg#T zhANNtR#s$I!XZefP-E5Tv53qV?1OXzjp^FsQ39n9hc;+}#y?PvxgTy-pXwN>$$?Io zfH~L(Gq>1HOLugKu7HeZ!3f;LZ+hj67m&{f=(w&@@Wl51~*~xs}^O_&haMW~qowH3Ay?qKtZ%}K-ZMXD9&Ndl%%!70QrDoh_OZ}=Ek=EO& z^QDa56Pch5uzshZb{4c&MankkNPitXf|U0CXnb9^ho`Lvxm{q^<0JM9ZF{5E zkx>Nwumwiz?8Ksa{?&(XA!weD!xHG(Z>0B{G0;Co@4{DW+&lb~=DOD0QOM}^#$W%} UE*n1IM!A?<2&)_c>p2IqK&{oiD{T4D3!V)Hv*##vF z!>HNa_x6LtB*vHom9~tTpssCv>7bg?B=Ca?SZjx<8)_C?KVv`8X)Izn0O-!0XOqJ+ zv_r|EJEo$k4IIwdxF(p2Qm0s?*@;ccH8Os@59Us#72IH*gMp z9V=_CajiP_Kz|G0a1F~k9=6Pxo-3T0^;h|Y&PM2KXne%_y;*$5@VMCqC2iP?`z_%2iI-G6=XAVq%r61 H&k9Tc(C4pj literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_decorate_locked.dat b/release/datafiles/blender_icons32/icon32_decorate_locked.dat new file mode 100644 index 0000000000000000000000000000000000000000..2232f98170f94c5b92e6c6b51b54719e72a5104e GIT binary patch literal 4120 zcmeH~%}T>S6oseKiglwdT0toEIYb1}r|@aIaOI1*b75Wh2yPS+7ruZCe^7T~E5z^0 zj1FObl1YMyxp2s2&b{YMZ!$?bR!WV*&4N<<9i>jYob*5&Z3hA!$g=DNJXgRYwMPL9 zFGXDs)DbhUNr1rE_|F)xC19u*U)evfOfO}x-4FDv=i$Ha9~U2+ zi}l~)=PoUaZ{+^7^#7&5^qd~Z9v}Qh|6QK;oOOMwUVo&L-vLsa>ffRERs<@>rQMe@ zV|--~r#$=Z8u{A#v!Qz+-vIYTeni>)m?nDioRx4sXY%#rEq-NZ*?XQ#JxA|NYc9t$ z$Q$U~r&w-L9=&U=xf!b=Z%^l*$8wAE=pAa!V~+fTaEEZ4Th>}uDQd2WK8#aoSQp!$P*eK1y)=1gdsL94GER<~g0ZPhB7Rp{4 zdts>*C0SX_hu_hC>)zA3=G8q@ic?SLo^zk`{N8it%xxwY1VIj!+Jayy69i`+3_8(& zi#>rxqp^l6EzmWY+cB79fael@w1EFk=DhSA z@U9xRi1CVx9eTa)AJ!b)S7C?!3-i;i8kqOSCu@}#=NLjs~x#&VE!=l z%+ODv0UvyMj?%*^x%lwb#S`tB_jdkG?l0hPvHxdV?6Vl%w_LYi|3%mpTW|`(jP}0y z)oOJa_Ngs63sJ6I|B!FqVdfWlVuL@+8Q8PMy0q`#9WqQiMu|0WZxU@dH0~-IpZ5G` z@a`kiPLQ((=10(?L&ItKW-XabYrvC56AlffhZyk)Nla9v^$jMf063{ Vhg~~N^I4QrvZd}_JO8hbKLNnd0H*)| literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_decorate_unlocked.dat b/release/datafiles/blender_icons32/icon32_decorate_unlocked.dat new file mode 100644 index 0000000000000000000000000000000000000000..cd151b8f306ec7205fa9cb3d0ffa5f822c295ea9 GIT binary patch literal 4120 zcmeH~%}N6?6ope;b)irZAD~-B)aMy+;X}9)6x_S;XX93=KM2x_zTfy=OhP)nFq2FQ zU1Z>pb1y|4|pd#&fYX;>#JFdItzMwf+OR&!F!e@Zf41+u|*EP|DdKa)z{>krAQ%}Zde%Uo_Yx7}@Ja>=3h4DUpG@q>h zVVe$lXEyh)Ew}4DdKXsnik5!}`Xh7T*5+1vR(uq_1Mp#WZ)lIfmQ#{GI04RE?%6#z zpQAEDA2sP{`#E5{hG9YGGQqOpDz F_yZ_gSoQz_ literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_overlay.dat b/release/datafiles/blender_icons32/icon32_overlay.dat new file mode 100644 index 0000000000000000000000000000000000000000..3edccff0d5b75cf6985b5b3d1e16f42bf45dddc7 GIT binary patch literal 4120 zcmb7{Sxi;y8HO1ZM^NjCasU}bAXbgDs923TnmQ!a8i#6(MonsB^upAnX}quw7iywa zU0huJ zK_TdNcX5gF;KdVs$Isz#i~{3<5129tlX#y9#sW{^`W<3N+=?tWAlcKvbSLya)rnv6 z6qm_Ph>Q4%i`$68zp=>ovUR43ojZ4~o-t#_U%b4$V%^-_KDxTPwj-j8_oC6GN5@Z^ zH0koPWy_+QnwrE#9K3-S_%462UpC9W*}!-C^5wfmjT-d`%qdp_Zrr%B2!9$rJaFKE z^nU8<>MCe!Ys)@-_;AI71q&K$YikqXln95U%F4>5ii(OP>`vaid2{u;b?fTn1Lkb- zvf{58aloGD)vH&VvG8JU;D=uM-5&%_oH+5HEI5!;f!@O2-rmB_&d$u1mX`Qgvu1VN zym>RHp`jsRI1VpgzRV;~`>a-LYDr1SdnX6mk|j&xC6j!}dH?>s>Q%N5#DRC^>D+DG zw*5}~;LzIG*jU`(-(S?z)02t*xU8(KRPwGzda17jlLPTL{6H)WKLi8>wB5OLC);kf zCyN8~w!*@~cgQT3Z0h%q=rZ~PW8=qIwg-_jZ<%o1yLYdQaWTln{x~?q5%b(NYu41Y zwzkGMH#aAk9LT{$aZo(OVfXIc6~w7b@el`mkSPvVuU>s4+2l`ELPCOSTO3@0`a|&L z%a>QN-alc&gm(OHXHG~47W`m2dh}@N>C>l+IyySy#X<29hc92gB#46<4|wLSUAwjp zy+%&JBZWM%F}C{n_!NjkczF0$1qpDP|A5fKr8(%O+DM=BZHK_0Nkjwer^Sc8Is zT8U!=HC`Va9Na>GX~);Cetv#!LSSHEEBXF~9IKx^d2*L{Bqk=lqZX2}KLh{R_V3^S zAL$?#e?zwPj|1v)p?vdqt-XHzx*VIz`MxSNG_-}7^w48!iCf2o3l~0SWMrf%_R0xr z!|;XTp;|~uNl7Pm+4SdLzNx{NJ-)ua?fCA$F1jitzEft zrRChYa}IpiN-gHd->h3?KY5g*cQYr%VYqlmui~NFynXw24t=tTzUerA{CJ~uP>Z$5 zG0&_ZVmY6hFVWh`lP4YUZ0hdrPLeJY)Ly&t%p5Bxl$Y!?ILH^u3Hid?+q+x&C=U8Y zc}ZWY-nen2@~erk&$QR-;I3ApX zUDB&Kne{!VYvrHxD+l!qU$}7LpS5=E*fFF2ke6rrRUA|U z4<0Uzxo@{egawi7k02PMnC74&rm$saI$680jY->$FB~whiq+ ztXt>{rDxBcEi_{;pA3c89zJ|%<;<@&`Jguud3o57J9FktqyH>jx^xFJb=Df^5YJE$ zPTi!6!~OgB%Ng5&(SvwesLMR^w?^+H0sob#SDNvFM<&SUzF?fi>c8aJ9ArqpaSl7* zBe-+yk$&RWN*&pm7d`-s&L8?`mwc}A*PuL6ztlP$();@Q3b5TaZQ8UV$tE@@S=0T> zhq3YF-5rF12x9XSla37=HdNwYJ9C1;Vd~VWoll=W&0=gB4%yk+snl`5>Ynv?pa2d9 zoU2KaN#1=dDk@UGOTYdB4Ez|Y79x=!#Tj0~g3f|`_}iHmat|FkRJm%^syf~+!{Ok; zgJn@sQT43J{vz<{%$YO)k}PVjWzU{H(aiY*?*YZm7v^*pswYI!C$}}NIjr2l`yV}e^qFxnIhSkNjhsGm?hnk*0RwR#hJ)e| z0wUr4Tl`?$!>EbITeoiIC>~q3Y-yuc^l}cF=cJu`R#`|$NOxFRSQq~K6cZB@&wbP` z{<51hQ@Z7M+5UfiABKa@WYt3?wnUMOagrmDe|5Wd?aJXy?3Jz9*Tj9Jk-F(sU){ca zyA{30y;u9$W8*He9$7yC_50DxfAhya`N4<<&j{omM5oa^`S_dvL3EbU&rWcMo6GmQ zTj@?eqTNGDv0wS1d(wOm0mA7&KhB#s@2}WvK}R9J?F8N2yG!7g$UWp5clWLIzF_uC zw`@?49k^=_)$^?}-^v%N7u9Dt5FbI~c}^%^${Xo5b*ry`m(3$_L6-cX{|@3JyQI(5 TFP%RC<+korKl^|2HQE0IRJppT literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_preset.dat b/release/datafiles/blender_icons32/icon32_preset.dat index 57d5d2536f1c64ca4afdddb186a41a7ed2d36e6c..f46bbac8a4d604186da969ee3b95c91fbc84b1e5 100644 GIT binary patch literal 4120 zcmeH{OA5j;6h-TAR>UQAT`t58h+_xNbpwJE2M*K)hqlES4VP2bJC z38yNGqC(5jTjwc*8OqOJC7_gAqr0U8<8dF2;&Vk$K?}*Bbt`mCsE6RK_fz}xHvP7Y zH|Ua3K7Z41uQS2BOsE^RocVver1OZKqxMelKQT9ntsVM5UUN&m-2Kq~<#o*oaBhR* zS92#}U+CB5k>;R}ANG3vPghC&^ZA?nish!nzhHjRcNrt;gs7MKB?Xh`elh{>>!5kb m{$qLOn7q#f8qiOp)UEYPsCy9?w1JyyN-4cOC5%6cp@$R%Hc+ z_i*h~!5>xN|Mg!zfdCNu1PBF`WF&bOdfmXsGUz90YimEy(9pOC-6p{E7&dGmTcWP6 ze%sjC_*eWcJBIGA=vgf-t@|fWo+L9fvp-Z-Rd3=&Az-yDu+LQ;&(13=E6>62vV()e zwuyflBYW5*BPAuJ8+LYf6c!dn_V)H$Mn*;}ussXK4*>Qhz5H?0qobp9AF}Ha z5fS9)=SO^x=Wj|29^?0CmX?-lxw*M?{rYvm!`j+ULJLJc9OfhJE^Fs+`xNNK$ew^JwLp3=@QM)&(pPQ*GM9f(CO2s$-=_oG2(ki zQBm<5$SgZMJ8#9u$5Ts73$?emQ(0LV+1lDZh11VvalE4wiX2>sjEtnYxj7md8lvLj zVk#{yr3)7>kc*4UHuB?HNJxly*4Wr6{I|8W(Z!1wnd2ka$(F;v9rEs$r>7^)&d$=z z%nX&3lnC(tu3Wi7+1c4tQ&U5=wY5}VUr$XgedW&A9;^T5|fA=;`S##m2^p^XED!C@9#MLv?kv@SU2PN+(X7cmltD zfULcfX-A`eZkd~#uW_8Gr>Ci_t4q|^UJm8u(Gc%K>rlx3ea#G}fPEO8q9JnT=Ii#edkgKcfw!XgpB5bt*=D<;w8icY?+dtaa z*lcp1jgOBDaGo(2?gx80?AE0;2kt{&US5PA{2Oe33A}y?0bRVW($v)a*~!Uii)(6h zbd-jNhef_|T+`FjpW{$iSV)|o`*C3Y{{H^l3s#YjU%|f53pj9(Y(>9WI(6#Qc57>^ z@H;XxLcP7c#65*;i{s1tmp+I5{Cqly1E1TubLR-Le1d%X4u0O=!@&Xf{pjl}+-tbT z1_uX4zvI308H|mMi5N^wOo)4~!CekKA6~>^w>L2F(9lpqzkJHG0{&v9IDCp+T|}L) znVOnz;;guSMV}803?%MlF)=Zen3yQ~409M57@&-d49d#N68X*?l9Q7uDk_S?!^0^! zIG6$g0?6Cjo7~*o2y>Ks^#-2-=J`X!g3rNyhr>I#)&l&kGKqKJV)oud{@+0lyAN&) zn4`a-53FFuJ?rl7Cg#Aow#$KIf_x|J;Su`oGGrH__Y?B?F3$XW*!>#d9Bc#%0Ny|6 z`hJU_n*lDs8Gz^PyFfMUF2}{iiCFaX^iWz_n&1!}9nIeTI zDH3mSU2t7-O(Wk|VYTw5SU#E&u8$$~iZ#p#LXF+SeZbLFUz*g1=+%puEq}w}7Xbf9 f`zn_a@_mkH6`a2RDjiGtI*;ESfPvJrWBvRGfHoqG diff --git a/release/datafiles/blender_icons32/icon32_shaderfx.dat b/release/datafiles/blender_icons32/icon32_shaderfx.dat new file mode 100644 index 0000000000000000000000000000000000000000..2888d09831f8d706f433fd94a288a36ba84833b3 GIT binary patch literal 4120 zcmd6qeN5F=7{?E(p=(xiC3;^1frbqu;lA*yyoqt~ZCo#;^0xj^GAG%xY%L5}t7bII z8jTW>2q9ro3XxV@wuLp=M9a-7>OwLtjS^Ab?)~;WzZdc1rF-x4w(fTBkNZ2%c|PCY z_dMsEA3;KhAZjId3GoJ9TPD-j6l(v|Pg0PWYSM^h5dq?!ep!ssp!`$fLJPVqxG$7{r4 zcjLzQn}WnFb$nXb-KqvV`B@b`Qv{5U=ilU+mB#$c)312Xe`b^!kj6pj%%c&Bs5g`a}I-Egiu^7$8yVwn~CF0=OVCghfz1{Tj+LhZpA!4CeBi*7l7_aDRMq?DiSm1J-;em0 zS;NScGqML?Yyj%gNJBdC$x@(k1<mC~|{y>NY(jf_ZH-yD)t&)!sRoeYKaE3Bb;%F%2~|7qz!*K$8{qMf0V7kn`|9 zktM_=Cyu?YIkRkbi zrc8YKa;#blpt)%Kr+Ofbi-_CL?20WmVEDSs?xVHG-ZGc@+&=J7Lt`e6m!}{t%wJs( zU9mc$9slUW%%?WY?EO170rpXu?etB1Q2(z$R~1lYR5V1=T#ygdF@WSlBKgEVELMD2 zMteji&R1Gsjgw>R+yuY#rI?E0++g(cx znT+Bb6C8to$vT=>J85WsIuN$`)39KUwD#TQvqxz~3iA!Y;y%(~Azuop1~yaum6Mhl zYOPc=9dzxXCY^C~#g8rT%KYxnZ`Q;0_rj4J;=~=G*pt-0p;k-zxA8j_F|sIUJilKs z+nW#RUCR9Yq(G{V5xGWq|Dk%^SE!Mmm$V<@=kX@57qNa+D<@dPg^p&~1Fl8lua253 z@u{ER6@B(057#k&YhJv}AG(UJQu(aoeM5aG@|6J2PyCClq5td=NyGMaG3v9I`igsN zUV6?l=9gH5&{tNe=G0CgY-U*;`IB~y4&k3o~yjHj;h%Mwb8k; z&{dqT?iuxB9avToD!)rcIhO$->X3PMsC>mg?{eP4cXZ*x z1|Ac1;5me8a1kR@ZiBBH8s_-K4i!cfxNLJr!=;S?F3xoFYVv7 zX%iI}7gKI-ZUcVhf8>BAI5=3K7fAW&6@uf7ypw0XW}G{B&cWZWUq2b2ZQHh)o%my* zgYzNzw{G1^Ce%FF3BRlCSN!qu@ufX_^x%9FMx#-3H1<TCvfnL#N=l0CF`R?$__uH0UOapD?DFp2yVtW^^a8i^=pC{Kf`WoLKdO<}8gjzO zwGE>guKd3Ie8-L*vQO!Bx(56z{zs1<)$iQ7vnVPmsu}vgOR>8esdm2A%UCb;mQHaM!L~ zh7~JTl=Sc4|D(UZzu32LpXBF!3_{y+s*)q+?$4B5=@>?tx;p^)wP=hws z5AiBOtrW5huBq(o>?Zl4tDHXu%pT^yb?cU+2dNmGI(16U;r;vf>!YKiwf61X3*?Q1 zAA2XRM_XcIqG|8my$05o?ckh#^5jXA{O}{$Y&Kbg%e(%^R}d_aYf$mK`as12 zd7ww`Y1mH*^exGc87*43Zp}T(hMYGYI&{dueVb&llmB5qbKce0*E_h?1^SmjkCMLd^YgP~HWael z0Rsj!X8%u!V+Lg2ZwA?HGyWUY!?%jg?HT^!xg&MJ-nz(1ZWd(x4z%P5z(-=kh7FRF z=R41TSD;4aI_D$54Km;J>6=Pr^Ij>PY-A)*NpM2v+m76LO(gJ?As- M?_-_+U%5U01sru-U;qFB literal 0 HcmV?d00001 diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 60f312c9d6b..e29619800ea 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -232,7 +232,7 @@ class VIEW3D_HT_header(Header): ) row = layout.row(align=True) - row.prop(overlay, "show_overlays", icon='WIRE', text="") + row.prop(overlay, "show_overlays", icon='OVERLAY', text="") sub = row.row(align=True) sub.active = overlay.show_overlays sub.popover(panel="VIEW3D_PT_overlay") diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index dec02faf85c..5601beb9228 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -113,7 +113,9 @@ DEF_ICON(FILE_TICK) DEF_ICON(QUIT) DEF_ICON(URL) DEF_ICON(RECOVER_LAST) -DEF_ICON(PRESET) +#ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK030) +#endif DEF_ICON(FULLSCREEN_ENTER) DEF_ICON(FULLSCREEN_EXIT) DEF_ICON(BLANK1) // Not actually blank - this is used all over the place @@ -133,9 +135,9 @@ DEF_ICON(PARTICLES) DEF_ICON(PHYSICS) DEF_ICON(SPEAKER) DEF_ICON(TEXTURE_SHADED) +DEF_ICON(TOOL_SETTINGS) +DEF_ICON(SHADERFX) #ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK042) - DEF_ICON(BLANK043) DEF_ICON(BLANK044) DEF_ICON(BLANK045) DEF_ICON(BLANK046) @@ -275,19 +277,22 @@ DEF_ICON(MOUSE_MOVE) DEF_ICON(MOUSE_LMB_DRAG) DEF_ICON(MOUSE_MMB_DRAG) DEF_ICON(MOUSE_RMB_DRAG) - #ifndef DEF_ICON_BLANK_SKIP DEF_ICON(BLANK099) - DEF_ICON(BLANK100) +#endif +DEF_ICON(PRESET) +#ifndef DEF_ICON_BLANK_SKIP DEF_ICON(BLANK101) - DEF_ICON(BLANK102) - DEF_ICON(BLANK103) - DEF_ICON(BLANK104) - DEF_ICON(BLANK105) - DEF_ICON(BLANK106) - DEF_ICON(BLANK107) - DEF_ICON(BLANK108) - DEF_ICON(BLANK109) +#endif +DEF_ICON(DECORATE) +DEF_ICON(DECORATE_KEYFRAME) +DEF_ICON(DECORATE_ANIMATE) +DEF_ICON(DECORATE_DRIVER) +DEF_ICON(DECORATE_LINKED) +DEF_ICON(DECORATE_OVERRIDE) +DEF_ICON(DECORATE_UNLOCKED) +DEF_ICON(DECORATE_LOCKED) +#ifndef DEF_ICON_BLANK_SKIP DEF_ICON(BLANK110) DEF_ICON(BLANK111) DEF_ICON(BLANK112) @@ -759,9 +764,7 @@ DEF_ICON(WIRE) DEF_ICON(SOLID) DEF_ICON(SMOOTH) DEF_ICON(POTATO) -#ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK248) -#endif +DEF_ICON(OVERLAY) DEF_ICON(ORTHO) #ifndef DEF_ICON_BLANK_SKIP DEF_ICON(BLANK249) diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c index cda70d405ad..d2a5ab80148 100644 --- a/source/blender/editors/interface/interface_anim.c +++ b/source/blender/editors/interface/interface_anim.c @@ -108,19 +108,19 @@ void ui_but_anim_decorate_update_from_flag(uiBut *but) BLI_assert(UI_but_is_decorator(but) && but->prev); int flag = but->prev->flag; if (flag & UI_BUT_DRIVEN) { - but->icon = ICON_AUTO; + but->icon = ICON_DECORATE_DRIVER; } else if (flag & UI_BUT_ANIMATED_KEY) { - but->icon = ICON_SPACE2; + but->icon = ICON_DECORATE_KEYFRAME; } else if (flag & UI_BUT_ANIMATED) { - but->icon = ICON_SPACE3; + but->icon = ICON_DECORATE_ANIMATE; } else if (flag & UI_BUT_OVERRIDEN) { - but->icon = ICON_LIBRARY_DATA_OVERRIDE; + but->icon = ICON_DECORATE_OVERRIDE; } else { - but->icon = ICON_DOT; + but->icon = ICON_DECORATE; } const int flag_copy = (UI_BUT_DISABLED | UI_BUT_INACTIVE); diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 38fac7cb37d..43b7b940b4f 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -938,6 +938,7 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr) colsub = uiLayoutColumn(split, true); uiItemR(colsub, ptr, "location", 0, NULL, ICON_NONE); colsub = uiLayoutColumn(split, true); + uiLayoutSetEmboss(colsub, UI_EMBOSS_NONE); uiItemL(colsub, "", ICON_NONE); uiItemR(colsub, ptr, "lock_location", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_NONE); @@ -948,6 +949,7 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr) colsub = uiLayoutColumn(split, true); uiItemR(colsub, ptr, "rotation_quaternion", 0, IFACE_("Rotation"), ICON_NONE); colsub = uiLayoutColumn(split, true); + uiLayoutSetEmboss(colsub, UI_EMBOSS_NONE); uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, IFACE_("4L"), ICON_NONE); if (RNA_boolean_get(ptr, "lock_rotations_4d")) uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE + UI_ITEM_R_ICON_ONLY, "", ICON_NONE); @@ -959,6 +961,7 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr) colsub = uiLayoutColumn(split, true); uiItemR(colsub, ptr, "rotation_axis_angle", 0, IFACE_("Rotation"), ICON_NONE); colsub = uiLayoutColumn(split, true); + uiLayoutSetEmboss(colsub, UI_EMBOSS_NONE); uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, IFACE_("4L"), ICON_NONE); if (RNA_boolean_get(ptr, "lock_rotations_4d")) uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_NONE); @@ -970,6 +973,7 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr) colsub = uiLayoutColumn(split, true); uiItemR(colsub, ptr, "rotation_euler", 0, IFACE_("Rotation"), ICON_NONE); colsub = uiLayoutColumn(split, true); + uiLayoutSetEmboss(colsub, UI_EMBOSS_NONE); uiItemL(colsub, "", ICON_NONE); uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_NONE); break; @@ -980,6 +984,7 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr) colsub = uiLayoutColumn(split, true); uiItemR(colsub, ptr, "scale", 0, NULL, ICON_NONE); colsub = uiLayoutColumn(split, true); + uiLayoutSetEmboss(colsub, UI_EMBOSS_NONE); uiItemL(colsub, "", ICON_NONE); uiItemR(colsub, ptr, "lock_scale", UI_ITEM_R_TOGGLE | UI_ITEM_R_ICON_ONLY, "", ICON_NONE); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index a7c79aa8e68..2e50111b01b 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -273,7 +273,7 @@ const EnumPropertyItem rna_enum_clip_editor_mode_items[] = { /* Actually populated dynamically trough a function, but helps for context-less access (e.g. doc, i18n...). */ static const EnumPropertyItem buttons_context_items[] = { - {BCONTEXT_TOOL, "TOOL", ICON_PREFERENCES, "Tool", "Tool settings"}, + {BCONTEXT_TOOL, "TOOL", ICON_TOOL_SETTINGS, "Tool", "Tool settings"}, {BCONTEXT_SCENE, "SCENE", ICON_SCENE_DATA, "Scene", "Scene"}, {BCONTEXT_RENDER, "RENDER", ICON_SCENE, "Render", "Render"}, {BCONTEXT_VIEW_LAYER, "VIEW_LAYER", ICON_RENDER_RESULT, "View Layer", "View layer"}, @@ -288,7 +288,7 @@ static const EnumPropertyItem buttons_context_items[] = { {BCONTEXT_TEXTURE, "TEXTURE", ICON_TEXTURE, "Texture", "Texture"}, {BCONTEXT_PARTICLE, "PARTICLES", ICON_PARTICLES, "Particles", "Particle"}, {BCONTEXT_PHYSICS, "PHYSICS", ICON_PHYSICS, "Physics", "Physics"}, - {BCONTEXT_SHADERFX, "SHADERFX", ICON_SOLO_ON, "Effects", "Object visual effects" }, + {BCONTEXT_SHADERFX, "SHADERFX", ICON_SHADERFX, "Effects", "Object visual effects" }, {0, NULL, 0, NULL, NULL} };