From ca00f938c2e7560ef3988c06ce7dc39e49cc022d Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Thu, 1 Feb 2024 10:27:06 -0800 Subject: [PATCH 1/2] UI: Icon Multiple Additions Additional icons for face corner, pointcloud points needed for general usage. Unselected camera, view locked, and view unlocked for #111076. Changes to mod_mask for #117467. pointcloud_data changed only for alignment change. Running Update Icons also changed mod_explode. --- release/datafiles/blender_icons.svg | 160 ++++++++++++++---- .../blender_icons16/icon16_face_corner.dat | Bin 0 -> 1048 bytes .../blender_icons16/icon16_mod_mask.dat | Bin 1048 -> 1048 bytes .../icon16_pointcloud_data.dat | Bin 1048 -> 1048 bytes .../icon16_pointcloud_points.dat | Bin 0 -> 1048 bytes .../icon16_view_camera_unselected.dat | Bin 0 -> 1048 bytes .../blender_icons16/icon16_view_locked.dat | Bin 0 -> 1048 bytes .../blender_icons16/icon16_view_unlocked.dat | Bin 0 -> 1048 bytes .../blender_icons32/icon32_face_corner.dat | Bin 0 -> 4120 bytes .../blender_icons32/icon32_mod_explode.dat | Bin 4120 -> 4120 bytes .../blender_icons32/icon32_mod_mask.dat | Bin 4120 -> 4120 bytes .../icon32_pointcloud_data.dat | Bin 4120 -> 4120 bytes .../icon32_pointcloud_points.dat | Bin 0 -> 4120 bytes .../icon32_view_camera_unselected.dat | Bin 0 -> 4120 bytes .../blender_icons32/icon32_view_locked.dat | Bin 0 -> 4120 bytes .../blender_icons32/icon32_view_unlocked.dat | Bin 0 -> 4120 bytes .../blender/editors/datafiles/CMakeLists.txt | 4 + source/blender/editors/include/UI_icons.hh | 10 +- 18 files changed, 140 insertions(+), 34 deletions(-) create mode 100644 release/datafiles/blender_icons16/icon16_face_corner.dat create mode 100644 release/datafiles/blender_icons16/icon16_pointcloud_points.dat create mode 100644 release/datafiles/blender_icons16/icon16_view_camera_unselected.dat create mode 100644 release/datafiles/blender_icons16/icon16_view_locked.dat create mode 100644 release/datafiles/blender_icons16/icon16_view_unlocked.dat create mode 100644 release/datafiles/blender_icons32/icon32_face_corner.dat create mode 100644 release/datafiles/blender_icons32/icon32_pointcloud_points.dat create mode 100644 release/datafiles/blender_icons32/icon32_view_camera_unselected.dat create mode 100644 release/datafiles/blender_icons32/icon32_view_locked.dat create mode 100644 release/datafiles/blender_icons32/icon32_view_unlocked.dat diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index 17cd160e70e..3becf27cbd0 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -41,16 +41,16 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1009" + inkscape:window-width="1837" + inkscape:window-height="962" id="namedview34335" showgrid="false" - inkscape:zoom="32.000001" - inkscape:cx="386.92187" - inkscape:cy="586.82811" - inkscape:window-x="1912" - inkscape:window-y="-8" - inkscape:window-maximized="1" + inkscape:zoom="2" + inkscape:cx="256" + inkscape:cy="185" + inkscape:window-x="56" + inkscape:window-y="31" + inkscape:window-maximized="0" inkscape:current-layer="layer8" inkscape:showpageshadow="2" inkscape:deskcolor="#808080" @@ -13847,26 +13847,6 @@ style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new" id="path10313" /> - - - - @@ -17459,6 +17439,22 @@ d="m 122.93095,287.85344 c 1.65093,0 3,1.34907 3,3 0,1.65093 -1.34907,3 -3,3 -1.65093,0 -3,-1.34907 -3,-3 0,-1.65093 1.34907,-3 3,-3 z m 0,1 c -1.11049,0 -2,0.88951 -2,2 0,1.11049 0.88951,2 2,2 1.11049,0 2,-0.88951 2,-2 0,-1.11049 -0.88951,-2 -2,-2 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + B^L~j%t&tLvPbqKV%j#!|x)s8svJy}=CA2$|G*TLQuwGEoO zJo6!6xmqZ)Up@33bFKf&TV@HjkMMPznlNn(_(t*Zt(PJYu}{SWwq*asPZQZc}H>t$hGEFhdFe literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons16/icon16_mod_mask.dat b/release/datafiles/blender_icons16/icon16_mod_mask.dat index b3105bb71834d14f63b9c49a551e313241be8eb4..d0e28be9de47e61c3f040ee755483f1cf3ad4cf1 100644 GIT binary patch literal 1048 zcmcJLO$x#=5Jso21QDauTZsq?LcM{f$SK_jR$PdSr$8_57WlD^Q z7?=%2_Jv4Aw;pT1#yNL~zIF4vk&3=zn}7b%zp`ToCCs6M8sbXrKN2eSz4FeVbBYc~ z`D^Wl8F!oEk3(K}+-ZhC(q5QxCmH@K#QObjFhA0SQ5t#x~- zX}}D6(1Z$XLkDi*Xw?jI+N<9ER1JC+rqEfDKO@&m<$^|D&vzAKYtePzrq%x9)2nw? zj(gBbFoXpxy&YgTZ7uOV)FVy3Z(z?Cfp)#Z?+pA4IEea3Xz_VQ$Urj&p&ow+=1?`- zCvkkb$|LT$gKGuEh8HakrE%**`uxMSl_Wjzg`@XZWAgeZ-$65WeXPCe)pse``jqc`^c=d2-iNHd%i7-5yp;9>og-V+ diff --git a/release/datafiles/blender_icons16/icon16_pointcloud_data.dat b/release/datafiles/blender_icons16/icon16_pointcloud_data.dat index 81f06f3f9d2147c858be1d69fe2e9396f1b7181e..1cee0b8a86fdf0016051ddf92f866596559dda8e 100644 GIT binary patch literal 1048 zcmb`^u}T9$5XSLMgcuECP((zq5EZqy6EtZ8@e!huPEgb|DTFi!Mr}o~NFz3uCap~Z z5#K-|C|HOnDi(Qz^FOi!%fTHHEPm|F?6-T|UD_Cv#y&>k#uVTQ&-*vN?+>DYUCjUG zZt`PzL<47d!$z-nkUhnT=Ba1#jfBpkR&q^b-3)yPJ-r7xdH%7Ur=Ed4zh7poNtAJg z3WhXm_x1g++0*ymw0nKb?jUF7`_^!eWZ;ezvvurYQTM3VaI3w&v(BvO&cbSPTd2AF z^i@=JMxDnw4l$*3S?L$>ib>m#Qa@qY_6O7t*v1h)Fc-LEhuIg}_{8tCSqIR?xaO%# zxYS-(X7Y_!FyYLm>7TWi)n?l6EUYFQ#|tv{Y>fH>)vz)WOYlVl!X+r)-*LVsMt`R<%Lqge{F^Wg2e5%1 zO#S6<@;SWV7+bhUIq4l_Pvo5DsfY229-aNRlDopJo1wqOxI2rh$?f4t_o)kbLrP|> zeb|RQ=MaOMwfk9SP1I4rJLc_PH+35an87w4k&WDuVm5~*4Cx;A0xq?;cb+pVxwE*M z+$zr8efnK&+PgZaS5U(#CL-A}X7VlaHa|lBjH2!3yENcq9rEsl$Q_H!K5zs1UDxc{ zUg|G+nx`(IqP?!n(#Rv@%tq;-w3n5B8rSYDt|lk%eh1&4m1kVw=f4NyRuI# zf$T~D5j?_$>va(=f>UV2j?(4Kj;iIouaI|IDB|lwU3;iU5Q#?2f&9Aed$SI5_h`4Mrvia#xupV_WfsM-vJz>ir>Z;6Sr7KPR}Rr!#xHO z-mlKtkvX~Zc5Flbzi{@5n=#f2UafNrt?^;5w_I(2~ Cd9bSh literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons16/icon16_view_locked.dat b/release/datafiles/blender_icons16/icon16_view_locked.dat new file mode 100644 index 0000000000000000000000000000000000000000..3114429e846599603e5b29192e91b6fe4b5cfb7e GIT binary patch literal 1048 zcmbu8F$%&!5Je{nf|U`(dsvF4h1f_e%>g`wjcEk0;t@o!v9_|Yv{5WXv=OZ0+hAZ4 zjIM0pu`_@E-z03}i-->kPh?yY2_Z5>Q9>NYXRy6)7|Utatn^RY@Y`3h$nWrO3--0i z&&W<3@*T1*hkTc8+aX^NO=O$*|0jR^X3ov7^qKQl-$3TM^cny1u&4QkT=Ez4jr={+ zo>>(h;H8>g(U%ZvP1no<*l11H%zAKwrq)f3=EDJk{7m=Er(pINK^VAcSN$ zxPeEK`7;w1HW!f`HkrtxAu6k(bIxqv1UAo@b8Q%!@@Pa$+U>Nd$0V-!g AbN~PV literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_face_corner.dat b/release/datafiles/blender_icons32/icon32_face_corner.dat new file mode 100644 index 0000000000000000000000000000000000000000..c62ef1360c7a4ea369fd4624ea516401f119c5b7 GIT binary patch literal 4120 zcmeH}OG?B*5QckZoTnQfJ6Cfi58_5pP{DwT7jU5)PvI?eKyc+*6yjHsl1@zek?BZ8 z8-Dsx)%E|?)0yg}F=h##N5<@fhYcoUW3nvk1@b%}f$c~PQ|O0t0A4|CTP5P3#}XI* z?|tA$%MjdEaLfDvOnn;hnSnO#Gk-SL@vELA>@$}Jv9}>-&s#MvYZI^ld*B*~4yOj} zQ_$2_7@it%U*)&w?AZlZKs20yg>Ba{>n{F@`nBnay#s6wo7Fg7@(Wj?;gVj?;S`iK zFz+mX%@q#$Z@U1Z;ZWBLeR5}-n)my$W4Xo<$bAt08{3chPw|gi@H@X8>^B4OM=48%@ literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_mod_explode.dat b/release/datafiles/blender_icons32/icon32_mod_explode.dat index 07fbbbd8bdb7f5c5f45bfbdaa6443ce236039e14..62fd9d7ee5ace69311f5ae0a92860be76c543f0e 100644 GIT binary patch delta 33 rcmV++0N($YAebPqR|^I6|Ns9glW-14v!e?b0|E1sp#d|q?+z&e`Ns{c delta 33 rcmV++0N($YAebPqR|^I7|Ns9glW-14v!e?b0|E7up#d|q?+z&e`ScC1 diff --git a/release/datafiles/blender_icons32/icon32_mod_mask.dat b/release/datafiles/blender_icons32/icon32_mod_mask.dat index c581df6982cf5df43dc41c5037303cba4c0df042..ffe018343215fb9dbaafab02443b06142608a849 100644 GIT binary patch literal 4120 zcmeH~u}Z{15I{$bcL;)LXCo=J5iD#(Ec^i*zd#T~xbm=&Q)ez;jLX-F3$~ z1$D-t@&D|57QR{k>bviep{K9`iv^n;&*2HG#3=jkox;b^a`&#=Cf9~D7=RU_es%A- zF00MhU9jd5>OZo4WjXvO;ENFdJw=i-htk<63 zmcz>7UWnkIu^d(o_gn=3isi6!xYr{1JC?)B;qFH8UsGek@|5McM!#vd5&T+WzszCv zaZShL*6xt!U&p_|mgRGEjNOJe@I|O!>*yTzzR`h05+T!(r0&b!Yx(SZ*$ch2{mIWu?OomWnhqzsi(k}S3- z$t&8VBT1^&>VGo!pkA-H!2n!>DR>0W;33?E^U(7*_K~~?U>aUVpjvisL>=TQ!PV59 z_vxR8Ug!q-x5FN|05wpJFW@Y+6|I9<<-P&R_Y{VqJu4snPB;g%pg7fDs0QN3T#g5{ z<*a#qA9|e=)vOv$`u@CUV)VXk-Q_%e$WQ!!cn&(F(K*oSoZDGD8p<6zMxKkHb&NL= zv(Lrcqs@HZc{z#if;%vpr!_y?%TVaOS&mj(=GM1G^Y^xrr)VtmK6dkOX*LIOLofqN zu;zG2tMha?CLcPTSFJz#-J`9*JmlFNf?Zj4;J5W}&C;0<{UEGBmi@$On$PqPTD;%l zyA4`@pYQXZ(P-V4mu^E_#IqBWSEd?*`@r}pNH^lo=Rc!afEcSO7GVdxaRGCFKBv*$ zqWNpk8PYhN&RVP;w>$)FgRd?ycqZ}P0@ZNF;`|ohU5K#{h}Nxx=Lr`$?dR1qKJ9_- z&{^njpm~ok#)kcPg8E(HlJB!;{3D<}cmjKE+*-!gAkQXDpKb}->;k`~$J2fMx`)O< zHRvAGUD9P5`m2y-lQ@Il5XQS*;Hu>dwP;ksDbW0?W6E^&8|}Z|_c7CjTKoebTMqgC zF?3}Zhb!izulrH<1N4p6ck2YKJ8Py-w`i_|Y$iS4OrO{zzcc*#{_Kd2B}RMy$;A%E z#)Wj`c!0D_a3zOR#@F_ z(RYKQ56aw}`e>T#E+pd-!m^}4`HW|)8K^U-6Q+Q^c{-c`h4x>wXY68hoezrFa1KsG zKPdEFZOL)TXFPk2mnJX1pyaJPwDIuPxR20|vUTZ~!#4N{diOat7i#g$gY)nTbQV2@ zV^HrKgRXa0T=wOqk+b{jV#rghPVIY|oM;NwAU7fB7+7O@YbP{rC^~gtnA#K5{CMp7 zTAk)AG)LWDGk;@fEct5C8qnJI?nm@8m9)R|&;y#RV z$0hsZ?b#v!E!YX$;S%V*6y2V2Z3C&?{$1tf(Hr2Q$zO1DzCONIcw_u-^NELDFlgQL zTmd?(6w3oOCy}%3w!!CdHN0A9YhWK7gbh&RdTbwkJ}COE=4;6x&AH;Z!nl+&NO`-Fr6IMez*n351=7Lhp=c_^O$#4gJ@eFaH eZ(J!g=Fo4w2o8b%chP;Hfg#-irF@rvQR_GJvvZ*U literal 4120 zcmeH}ZD>zX9LMiAYZ#OARBJUgOVpI5$O}SBBBeYuH3@I#A<>eDnmjjoffC-}#gr(q zqE>q$Tk`Nm@`6QqERzUp97> ze$ejfuX~{OAv4b#+9gn+xo8K$X6Ob*O<&&wHOt@&e1&RPee$)Scm~nExqP|gs8^@L z#JRNbXj&T&WFn@g`Etoq?{HK#3^)14<2h}7wLV`~jhg#R-JQO%chopQsJqzA ze=BV)`cQald=)Mq+7MU<`hOZhdwHbG8_(g<8h-(b`naY(xdJ#Vk!Vfo##4jV8993X z`NZW`$a9UeIrN2~vqo_d7C<#DhjviBhY5C!ZON^ZXhLVzcGv<}K<9?ynDwW%c=YT( z$n1#cNE_v$dy(mh3N}?<|CVq{s z^=hB3&ha9v)6a+Xpm+ZbdVJfsE`sZz(EM8K2jL9Zv+foBv9_kGMV}Adpm+&Qpl`(^ zP-t&%NRB19Un21YCdPHHhr=~cw1M-z*)izT;4UQNF^NUiXIpZE;UnnTOt$%WOJ3)> zUEed}T3R1}6|8_-&^Z{U)t< z{l~}lwogs{?r1l2=-Y4}^t?|&Cn#Qn^Y>0~=kfWdt$la`bUr1cm4x@~@zu_vF;6M1 Ogl$jTb?00io>rWjsXDg_uI5~` z+5FF6_zhaERuvAzI^2RAunH61o-=BU!cBPW;UxW)Zj1xp0l1yiy-Yg|J75In;XY_w zi(RU}lK8LD_GD|&Hx3Wr5sYN@?L6bBIoJEid(h{FrthzBu;7a+(~sY-#P?b#pBT-F z>aT_3I@R#gx|8olC>MQC5_cgK*QthQA3RLx_vND>1C8@UAVzaJ0sCM#w5_GQT;dua z?`4lZjCMDP8PCShueu9h`$S&i4jh5tzD3tQv)r@X?^F%iUf2&hi{!VOQ@cjL_N;WR z;VW7n9dVtmd?>W;z!A5XgHa-JiWjzm&vHXSMA-Kh7JTYj6>yH!ROu`WE3k_^vMqMRTj)4|~7s ziicS^3if|O=f{B6Rm<}je1)RxGXc4K%ly#grP_MWEZVae?pJFKKgvh^ix#p=2vWS;(nH?6UxCez21w4@-5_5Mx)@nqM|ANZJ8RO z9K5wRVz2d(R~e1MTCbZC19(%$KPHFT`rrRLFosuX-v4AVHDY3@u?#wIKfrr<4ofk) H|6NFjeOLF~kHMQ&zq{93d+oK(*=L`9_HB%!s1bUrqNu%p z6tzNB6GfR!rYy4A>{j>&P;}SRx!MkmOvD=oY%JtJM7mLt?d0^=+QWupFKyNwxmtcfk6s#h*9d-nO{3wpcuU z10e%nAr_wp=V|DGYW30PU5}6Vb~*9HX#HP?4nN-8K|a)qq^#%V>v@}snvY5)H-A3g ze>?qq$0QGfz0eM}Z=hBzpBd2wr(hYxdtR}*C#D%*!@rQ5B%PL4pT0#9e~)O-!$KI8 z7GKKG*gBX5JHYlF&F4}-7T;ia36lL#a;|)iVmA47EyqBjYnUF!W9w`o(SGn(Yr8r} z;wstfUD|kWQ$PB}#J|GgvFE{K(B8Mk{D0DtX8=3|$!g1m{zwj_G4N^sFnN!XdX@{u zR1>GY{TXN->wfF4UoG|~keo3;y51AX_`rAjw=4dA$8T=FEXKFQ>wB&`np zGhrt*`51g!R}y{ar-HukTJO2JLsxyB$5g*Isb7z7XUqfW1>XVudUm!)d_W%;UIX@a z@N(3}j73rKX`cAp1bjwDP6N!cjs?sSud5?NVVSV)S6C@U+))HE!#}H>$ih z)J-;R)EJ&DoTwNxQ5stxz8qXAf7zyu8pAiMym!>iQJQLf_=Z7#*Sy16HN753I|wfz z%e3xKQsZ9^qI{p>McRc*aTt?pJ`b-T%UUI^YdkFR)Pv%b}L)K z!a@+^cT5h%kWEfzlVZ^WKQo#6FUefkZ8_&!pj~(Fy5Zaza82iWz1}YbL2w1Cs>@_v z{F%^tRl$+(XFM<2kL73blDfQStFM)pmzSKk`dWEO|Ga0bua&2H@a3##o+;s4eXYDA zo<+D5mcPpTN_~Nj?nzq9yx!}~du8QCYdVCl^^lgUW00!If6;K-fo7$(73HtsI|R>Q zIW1Smm@obN)!Wkk=TF@Fvt^Z3=KYtmMCwH)$)V|andjBw<-_4sP50Hu+oJjF`Laf= z!FzaQf*H%2mCYghDavn;N`nDyqo`i^=(>@|2kny818xV1MrzHfOXHzG`f&;UcIemBcrqq) zK)zeE`=hwlalB+74}sP#odd7{=D{3T1p7edwEA?WtT}l+yw<^^nrF1K-(#)$sCU7) W3FJ(i0QuHe@CNR|G1vfw&e}J(xT#M7 literal 0 HcmV?d00001 diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index f1356e82ed2..e1bbff70655 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -514,6 +514,7 @@ set(ICON_NAMES ipo_ease_in_out normalize_fcurves orientation_parent + face_corner vertexsel edgesel facesel @@ -694,6 +695,9 @@ set(ICON_NAMES handle_aligned handle_vector handle_free + view_camera_unselected + view_unlocked + view_locked view_perspective view_ortho view_camera diff --git a/source/blender/editors/include/UI_icons.hh b/source/blender/editors/include/UI_icons.hh index d3acda9a376..12012541431 100644 --- a/source/blender/editors/include/UI_icons.hh +++ b/source/blender/editors/include/UI_icons.hh @@ -620,7 +620,7 @@ DEF_ICON(IPO_EASE_OUT) DEF_ICON(IPO_EASE_IN_OUT) DEF_ICON(NORMALIZE_FCURVES) DEF_ICON(ORIENTATION_PARENT) -DEF_ICON_BLANK(636) +DEF_ICON(FACE_CORNER) DEF_ICON_BLANK(637) DEF_ICON_BLANK(638) @@ -746,7 +746,7 @@ DEF_ICON_OBJECT_DATA(POINTCLOUD_DATA) DEF_ICON_OBJECT(OUTLINER_OB_VOLUME) DEF_ICON_OBJECT_DATA(OUTLINER_DATA_VOLUME) DEF_ICON_OBJECT_DATA(VOLUME_DATA) -DEF_ICON_BLANK(267) +DEF_ICON_OBJECT_DATA(POINTCLOUD_POINTS) DEF_ICON_BLANK(268) DEF_ICON_BLANK(269) DEF_ICON_BLANK(270) @@ -867,9 +867,9 @@ DEF_ICON(HANDLE_AUTO) DEF_ICON(HANDLE_ALIGNED) DEF_ICON(HANDLE_VECTOR) DEF_ICON(HANDLE_FREE) -DEF_ICON_BLANK(882) -DEF_ICON_BLANK(883) -DEF_ICON_BLANK(884) +DEF_ICON(VIEW_CAMERA_UNSELECTED) +DEF_ICON(VIEW_UNLOCKED) +DEF_ICON(VIEW_LOCKED) DEF_ICON(VIEW_PERSPECTIVE) DEF_ICON(VIEW_ORTHO) DEF_ICON(VIEW_CAMERA) -- 2.30.2 From a961a06bfbdd549a906eea4571d3ee9341860673 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Thu, 1 Feb 2024 11:00:38 -0800 Subject: [PATCH 2/2] POINTCLOUD_POINTS -> POINTCLOUD_POINT. And missed this one from CMakeLists.txt --- ...cloud_points.dat => icon16_pointcloud_point.dat} | Bin ...cloud_points.dat => icon32_pointcloud_point.dat} | Bin source/blender/editors/datafiles/CMakeLists.txt | 1 + source/blender/editors/include/UI_icons.hh | 2 +- 4 files changed, 2 insertions(+), 1 deletion(-) rename release/datafiles/blender_icons16/{icon16_pointcloud_points.dat => icon16_pointcloud_point.dat} (100%) rename release/datafiles/blender_icons32/{icon32_pointcloud_points.dat => icon32_pointcloud_point.dat} (100%) diff --git a/release/datafiles/blender_icons16/icon16_pointcloud_points.dat b/release/datafiles/blender_icons16/icon16_pointcloud_point.dat similarity index 100% rename from release/datafiles/blender_icons16/icon16_pointcloud_points.dat rename to release/datafiles/blender_icons16/icon16_pointcloud_point.dat diff --git a/release/datafiles/blender_icons32/icon32_pointcloud_points.dat b/release/datafiles/blender_icons32/icon32_pointcloud_point.dat similarity index 100% rename from release/datafiles/blender_icons32/icon32_pointcloud_points.dat rename to release/datafiles/blender_icons32/icon32_pointcloud_point.dat diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index e1bbff70655..aaf873be126 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -612,6 +612,7 @@ set(ICON_NAMES outliner_ob_volume outliner_data_volume volume_data + pointcloud_point current_file home documents diff --git a/source/blender/editors/include/UI_icons.hh b/source/blender/editors/include/UI_icons.hh index 12012541431..49a7e34acef 100644 --- a/source/blender/editors/include/UI_icons.hh +++ b/source/blender/editors/include/UI_icons.hh @@ -746,7 +746,7 @@ DEF_ICON_OBJECT_DATA(POINTCLOUD_DATA) DEF_ICON_OBJECT(OUTLINER_OB_VOLUME) DEF_ICON_OBJECT_DATA(OUTLINER_DATA_VOLUME) DEF_ICON_OBJECT_DATA(VOLUME_DATA) -DEF_ICON_OBJECT_DATA(POINTCLOUD_POINTS) +DEF_ICON_OBJECT_DATA(POINTCLOUD_POINT) DEF_ICON_BLANK(268) DEF_ICON_BLANK(269) DEF_ICON_BLANK(270) -- 2.30.2