From 0dd6e5bfee3dee0ced75e9cb03e950627b59e75e Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Sat, 10 Jun 2017 16:41:58 +0200 Subject: [PATCH] UI: Replace placeholder icons in object-add menu Replaces the placeholder 'emtpy' icons of "Force Field" and "Group Instance" entries in object-add menu with proper new ones. Icons by @zlsa, thanks a lot! Maniphest task T51291. --- release/datafiles/blender_icons.svg | 530 ++++++++++++++++++ .../icon16_outliner_ob_force_field.dat | Bin 0 -> 1048 bytes .../icon16_outliner_ob_group_instance.dat | Bin 0 -> 1048 bytes .../icon32_outliner_ob_force_field.dat | Bin 0 -> 4120 bytes .../icon32_outliner_ob_group_instance.dat | Bin 0 -> 4120 bytes release/scripts/startup/bl_ui/space_view3d.py | 6 +- source/blender/editors/include/UI_icons.h | 4 +- 7 files changed, 535 insertions(+), 5 deletions(-) create mode 100644 release/datafiles/blender_icons16/icon16_outliner_ob_force_field.dat create mode 100644 release/datafiles/blender_icons16/icon16_outliner_ob_group_instance.dat create mode 100644 release/datafiles/blender_icons32/icon32_outliner_ob_force_field.dat create mode 100644 release/datafiles/blender_icons32/icon32_outliner_ob_group_instance.dat diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index d88788fa904..a9c0fd431eb 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -31358,6 +31358,136 @@ fx="-0.78262758" fy="294.63174" r="6.6750002" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + &b6f>>$A=bzr zEWs%fMez{)|FJpBwX3peY{;U(XZ12XiRYqk84rGKk*rzHTZ24i zHA~^o5&Uclktm$O(uC((tqg9JOMoMBCr4wwCPmyLOXAHeNgOT9kOUEDjG@KFl{yLd z>T>}3k9dBTG?sLkH!S?}Y=t6q!p~xL+_%65C5+VVKsm$|OJTQ%8!Ygm$qHo|i9v&m zcpGTl4Rux}FeG6{`}B=8n4!h40ge*Cn{41<2&{YP|sDqgr6|YN2 zjad#8jd{S)cn_+pjo0R%h7^9h_aq1IQVrjC_g7yhz*Pgl*(8|vocv>WGkl0-_Eqi}KI{WvT&# z3C(R-Pvh-Hn#6(9^i7kfo>mm=Lwa7~=Ox^WP_D4fRjvOxKjnqN&ht>kZVs00kp8}C zQ^Ql2iSHZOWPGKN8_6Oq?T-BILBF>H=6r6LdvFTIE*HSDY#Gv;=!(P%k1^7iOteow zOJmavjr$P>4Kgf0JTH>(L~p1_oBZaHL%6{JaD v4RyO<{9ZHoTB?`$t;IE zQJkb1xpxVl>oV}BkcW!Y?Wz!Glimm?vSPXVp{{0k-Zf@Z>aH?KMG5$rAAq;~AaobU zpd`^2@U5<-Q?bI+RNi{T&&Ok1T#_;V>yyyF)uR09}*rt%TUW2qT z6{55L$ctwqdYiG%$Jd^ChI?2|Q$H1;MqYywmq6We0x}^FBcfyIuT4X8pe-hA!Z0p8 zjQj{o6vsM3km81{u=R{bPl$_IdDn}_8m(#?)LQWkJzdj_T8UQJLb5$=WbX z)W_?1#-ku|4N8*S;KL#VUYm&t-NP@>9yX{|vQbbI{ZRJYN7MB~IJtWrzEyGN_`6B- zd?9Zws?xo6Jk!rmYhoC@)i`gTi}@gzZK39{EwsWL=OAU+8ZOO;>+a9gW>m9IMM=BJuZLDAg=L9&~UzZqqNhO3dw@=QPEPp&{cA_1kGgnFzO%J0Ky z7hXnrk~5lfk1oka?XXg5)ia=ELr{Hs3PqOyidUsjh$}GD_W%QJrRb==2tOA2y7=r& zOwUEgKkkQadj9hEqB)k~X^pq?(UKjBL|+@qpGC6&#_K#B2%Gj1gg6<<>MjJ~LwyEv p;@lCqNq>}nHw6JK;Ciee6jk{RblGudlyw{}%^ufr|hD literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_outliner_ob_force_field.dat b/release/datafiles/blender_icons32/icon32_outliner_ob_force_field.dat new file mode 100644 index 0000000000000000000000000000000000000000..bd57178b37730a924e7b996e1f09ae9fc3cf50b6 GIT binary patch literal 4120 zcmd5w44im`1tRslP{ie%f1`KD7V0dewCrQ>ce&qoPq? zXu@ad@K{D&sQyxi<13l5_h{+;`+p;p?{h`zW30&Ugz~sHQE*FAVlY254q{tk5*wj< zGR}yNFe(42U_=x?S{)Cp8H~l5_sW{fB2Tj-BR!VBgYz!2<8^9>-7%3rbh%u2a{L?e zdW27U(`{*)vc_%cj|;Eu$$a>CmtxuY1m%OrsVxh|&x!fLUDRuncrR2ARoMTm8Hy~I z0k^3)c`bb@h|B10q5?RBHBw$Y| zuI?ztlu-jk?suCJX|@lmH|ZKxAe2N8@}2<(oXpR`KZj zDA!I)d!*E4l8VPMeGmFV9l)GxZZO#zh}3{fz8`VMwgcFHE<6 zI7vUQjvE?Ae`?Y|{HK1T!fvk|hUv)z zZ22kAApN^MMed+ph1ihXi=AstB?_l*+RuYH#u1TMOdPKG=Ncy2Hkuhji^O94wj^gr zKxXP^9vBjdx1M?sXez?rtJB#JhR8mq{${VG?c}kbAOO z)=f<`@Z|UyY?^o<7Nsb^M9!QAVtsags1UL+ok&NCF)$9kQmK< zn1SoNXJFD#qrp14ME;fh5z%O^$i~uf!8|*)RPwvUt|C*fVGO786IqX3+x>hA#6QX; z*X@tF?}dNg#)fE}}dr|9Db*8a*QG#9EINzZN-TSt~>EB~ecWbSrqkMR2mmQ(w^ z^q@MYEWJQ#QO%wDzhwc<6kEn?$%P#kkvEVa$1-;4g^+HnL7@ zMxrQD<#Dg*t_y>IGgi1c*LFUf8i@ZN>w>*v>MEuaYf6Fl+kn>_fyMm-KGd?-8mFUs z#YkkRb3tDv`1L{jCi^T1p3C7dLwRyXWXDJ0udBzaeimD-i7b9kFZ2!qIxhfSSDA+v z;6M$qzZ%$9iapa*Pa%D5}^*6sNbb+#g(jEr6@?c{V4<@m2Pa z)GD?u%tg=11Hic>!13)s^D?~l%TzqT{$}rP6uTZ($HAKB8k^r6=FNPcY4qcsSJRh5 zkEvxa{zkcne5S_!(7W>!nBU?gG?t}ec5+m(cZ`=kaoSvBt)xx`Z6veKYUQp8cjw-W z8E#I@`5}1_9NtOVbM#5-@o%Je=x4LnX{_h?A}QcY;M*#1sc?4t%A>v3hth_i>+B(X z@Ol#}W@Lxj|2O4wE-0SV%(l6|K;PLH-v7YFh2?i)bI8#sS( zJ2ouJ!-BEHQI-*ps;Q&VIM0hqTc)ahm$!!fM({c#62jT-E01S|n?CpplLz6%v(@mo zABFPctwX>;o&}-QJO^*q<*T=d%89AJaI5Yv**ifFG>Y?k>FaHO#kr*~E1{hjl1 zWzQnCZ7f4e)nt_C4YT*gFXv^7E9%>!c5Y|vbKUcOo(pT~gL?m|_&!~0Hg>Bw&fvxQ z*>m-FcsVgKUnl-U#NE#CLDGJX53$!;19z*@!tu-Ow>i?gw}TaKt^G#)A9369tGAuJ z>%!T&6`s87iQDx=aRz$cKB{{0@`)F4uH_m0WycdZwQ)8s?Oueg{pHwOo~Qg^9wy%k zR=736H{J)!rg(7e{NX_TOE22g%JZLn;D5E^27c)KI-Jcf%Hx038p*vc&cMu!VOTjk z7fmbXV0ZN_{BCj*W_c`RB?Ql5zNe*Lz9`1$>C3&uUVMdqw3B!af9kBg%=t0-=lL@G Tt~Z|~KCcxK&3hpBcJTfSK*LR2 literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_outliner_ob_group_instance.dat b/release/datafiles/blender_icons32/icon32_outliner_ob_group_instance.dat new file mode 100644 index 0000000000000000000000000000000000000000..868f9e4fbcc8795e015184f0b919f7c2559e8fe7 GIT binary patch literal 4120 zcmd6qc~lkW8OA>)rpM&uw5BJXrW(U0Ry?f>)y76dc8uVH0Td9FTnTG}Hq}VnKonHe z0%aFOHW368Kp-X-i4kNINkCKt$|j2_`+8^Q={o~hNibSWd-}(F=FZ%i@Atgxe51%1 zQzV-@l`*d=jAgt;C({@M@PBPOYHZeuIc&!NN~g(h*(Co!F+%_!w2uj;M@sM8#DJl{c)*Gh`R2Ph5LgirNfmugc_jp>mOJ7}#YaV^nE+YJLHX7WtF3cIpV<5w80 zFM`lm2rl0r@^mK*ByK@xjD@73F7Q3vJ*9{5eKb+*u?#m)t&?(*eb7i^5xZMt8qJ%A zAQvroTm4?T{yaM9o}Rs1b-+EWhR|FJp7`9?`yl_q9)0Jx;8CDzYCRpL&Su-?+twl|M5h{JPQFi!U+>Um|_u<=Nz2s%AU-TOK z3qsMC7l7W&htQsR04biPNc?Oy{A5dEvwS2^6U9Tk78mFRVXzCrqgwEHv%r_01$Xrr zxa_}TIC&d-;w{l0^*)+HsUH0eaO=1>Y7%#&{EQRK7EXit($~pvUvwqQ(0Se(O=rvy z;jj?r-3^hj#}KhQHF4Zp9hOU9dmInS*;RXb0}%h=#}=C4hX)|^KLX!S0RDD5_!8=c z+#`@@?!eFmTdK#+Xp1yOLx?eILQT<_?uD{&8I05z+}A0gBW43SVolMRWQ+Sz7VtBB z1AgW+5iV1g_%UwpBGPFwj+iN7^OEUfb>l(&FLfz@{k=Vad=NrsJ@~q7)CZ~H3q!%> zctW1xih(2>bjFVKL|d9WS}*zHs{b}=oe28{qx_BNx?qR<(Uv28QNyT?&~0isq;NF0>dmC;#`jD#=RDy*XT-jJ}dMq^1IVMLQ8_|seG{~!<^sw5nt4xt;FUL zzd+O=n%-Om*lMdlraxDjF=N-golMXaZakhX@y*bk;f9v;A5O>*w0aB42R9(nO>08F zsKJae1**wSl#c-7T_+nP>mcLIm;M?zax)-rt@tr}jDPVHv?e)D%(tF{&ktK5>Jz=E z^2hQqb`k@=*>o1;5xH(D>aOvn$iejDk>wjg%Tn&;+^ z=@9v@#`7U?L*O3OjOUVuu9WQ(AI+E*=d+(4B`(AX zgt= 10: layout.operator_context = 'INVOKE_REGION_WIN' - layout.operator("object.group_instance_add", text="Group Instance...", icon='OUTLINER_OB_EMPTY') + layout.operator("object.group_instance_add", text="Group Instance...", icon='OUTLINER_OB_GROUP_INSTANCE') else: - layout.operator_menu_enum("object.group_instance_add", "group", text="Group Instance", icon='OUTLINER_OB_EMPTY') + layout.operator_menu_enum("object.group_instance_add", "group", text="Group Instance", icon='OUTLINER_OB_GROUP_INSTANCE') # ********** Object menu ********** diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 8420591aa3e..0c83038b7a3 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -313,9 +313,9 @@ DEF_ICON(OUTLINER_OB_ARMATURE) DEF_ICON(OUTLINER_OB_FONT) DEF_ICON(OUTLINER_OB_SURFACE) DEF_ICON(OUTLINER_OB_SPEAKER) +DEF_ICON(OUTLINER_OB_FORCE_FIELD) +DEF_ICON(OUTLINER_OB_GROUP_INSTANCE) #ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK120) - DEF_ICON(BLANK121) DEF_ICON(BLANK122) DEF_ICON(BLANK123) DEF_ICON(BLANK124)