From 179105bcf40ede38f559f7ed02c395c5608a8c31 Mon Sep 17 00:00:00 2001 From: Lucien Fostier Date: Wed, 15 May 2019 15:54:22 -0700 Subject: [PATCH] Added support for nuke icon, using new icon for nuke menu --- SConstruct | 12 ++++++++++++ config/ie/options | 6 +++++- icons/IECoreNuke/CortexMenu.png | Bin 0 -> 9497 bytes src/IECoreNuke/plugin/menu.py | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 icons/IECoreNuke/CortexMenu.png diff --git a/SConstruct b/SConstruct index 11dcabca1c..526769a340 100644 --- a/SConstruct +++ b/SConstruct @@ -723,6 +723,12 @@ o.Add( "$INSTALL_PREFIX/maya/icons", ) +o.Add( + "INSTALL_NUKEICON_DIR", + "The directory under which to install nuke icons.", + "$INSTALL_PREFIX/nuke/icons", +) + o.Add( "INSTALL_MAYAPLUGIN_NAME", "The name under which to install maya plugins.", @@ -2445,6 +2451,12 @@ if doConfigure : nukeStubs.append( nukeStub ) Default( [ nukeStub ] ) + # nuke icons + nukeIcons = glob.glob( "icons/IECoreNuke/*.png" ) + nukeIconInstall = nukeEnv.Install( "$INSTALL_NUKEICON_DIR", source=nukeIcons ) + nukeEnv.Alias( "install", nukeIconInstall ) + nukeEnv.Alias( "installNuke", nukeIconInstall ) + # nuke tests nukeTest = nukeTestEnv.Command( "test/IECoreNuke/resultsPython.txt", nukeLibrary, "echo \"execfile( '$TEST_NUKE_SCRIPT' )\" | $NUKE_ROOT/Nuke${NUKE_MAJOR_VERSION}.${NUKE_MINOR_VERSION} -t" ) diff --git a/config/ie/options b/config/ie/options index 14297e3162..5bc2322622 100644 --- a/config/ie/options +++ b/config/ie/options @@ -208,7 +208,10 @@ if getOption( "RELEASE", "0" )!="1" : basePrefix = os.path.join( installPrefix, "base" ) if targetApp : - appPrefix = os.path.join( installPrefix, targetApp, targetAppMajorVersion ) + if targetApp in ( "nuke", ): + appPrefix = os.path.join( installPrefix, targetApp, compatibilityVersion ) + else: + appPrefix = os.path.join( installPrefix, targetApp, targetAppMajorVersion ) # find 3delight. we only build the 3delight stuff if the compiler we're building with is suitable. dlReg = None @@ -311,6 +314,7 @@ if targetApp=="nuke" : NUKE_LICENSE_FILE = nukeReg["wrapperEnvVars"]["foundry_LICENSE"] INSTALL_NUKELIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_MAJOR_VERSION" ) INSTALL_NUKEPYTHON_DIR = os.path.join( appPrefix, "python" ) + INSTALL_NUKEICON_DIR = os.path.join( appPrefix, "icons" ) INSTALL_NUKEPLUGIN_NAME = os.path.join( appPrefix, "plugins", "$IECORE_NAME" ) # find houdini if we're building for houdini diff --git a/icons/IECoreNuke/CortexMenu.png b/icons/IECoreNuke/CortexMenu.png new file mode 100644 index 0000000000000000000000000000000000000000..5b0a1f20c610eb70097fac0e8ac69d14b4d0effa GIT binary patch literal 9497 zcmb7qWmKD8u=NuHp+IoAB83-g(W0fe7kBsK?oNQ>ZUu@KcPZ{xtQ0TBAxLp8?l=AJ zkMH+gN!Cf8l{4$;%-(w@QdvRyXS z+1`HYv$un}u9l2(kt*Y&D*ci>+d*9rdfjtTFH z4A%(^9Awe|*5!qg0YvK1eA*;HEM1OOv@=PZ;Q+v z`hBC4+p_0OWk|ZW^p!X!x8Ry4-@(N~11P!AVs3-^3KvujY8ir_L zH2gdt)jTQrPzhgH{t}7*nBge#l;>M*AC;m|Ui>_~LWbvsUEGil7KOe>|)n8%q)| ztFP-w9|1g(ncXWr^nkt~D~+rYWe7D$s{7m|Z>+ox=t*;v<@2~BC`rfL=+1}sM9x?4 z^D^C_l^7FGhgBO?(14xr>R5hbLvCCPCHiD<&;8qcR%%9oEM&_*8-Q7rc3lvYb8|9f zEPEKBke9a^oG~W(fJc`VlM8uMGs+v8NV6Gpu<|;mPX|~p6c$5o2hk2a^2>%Lr-1l? z=(GfhUL~0qgl5_bq_9`2&kYyG5q#J^A#Tz#w&DPnylmJ6BY0P42yej!JwWWshB?ze zYr}v*L}J-N0sjqG;ajnMCK07*R6P;MB#qf<#&9Tio^96)YfDhHG^-IYUD|f}pXtfn zhFA#DFKa>>5^so#T}6~5fQfvSJ+#klldfk6z#!3tS>VetqPM!0Z;hJ=)zr(o`0A1PSRGP|Aq6(O$4JQ*;wwGuPbq5oU0NnO){w^OarYg6C; zOAHpR4IVe^B`JaCVaDiQnkcm!q@wo3irxRdINXY!f7u(cM;ct3H?E8}eQT4cXUC_j zA9u*2m1v+Gm9z*UUcl-(tPBl{9|jghCY9&Ri6ljzl<=*IHR`o!w$U*JpE;T=G2|zC0Nc&D{wo~ zC2Tp$ayGkwbU55zI6Nkab!FkPk)<^Z94D1D+o_}yWW*yy&Rj z{)#%tZ5;^9wq)B(HrsJ({iZ2vV7twH)^&(-rd2r4H^N-jFf5oBOcjBC9HWB`?HP{1 zk)(nlI(pHTW9LNdhZGF_(a!b9YnA*XxBG>>9)kt=SqRNbjnQoyQTjE{>Xetvg8HsF+reHVhc0saLY=#*r12bsM$UvB*Dp>7 zq8J9v7JF7F%lB;hf9I*7kr4gHH1iE#KWt=H=UGiqgTQH`n)#GrP+b`+@%U{LCn9>|q%rf~%m%|yu(5`0<74vS zC)5{Y+@A#n@oMBr(RfL-QV95sxc&tR#fki^6h% z*#~@3@65ce9r(Ojx9&&f>7u$9sw-F*8s986ashF($}*`N&&AR(wx_>8Um=c=eBz$S z@xdY*)%cgFE(0XG6-9`JpYgz5HLER9$HEnWZXAOr$@jXF{P)wLiQ8o{MohM7Udg-F z`w{c9+|mn8uHIdJd>76A+$KrvDL*3EhRfy@?pLq#I*!TG-DZDFGki&sZa!EiF*Hdl?kAFczIc@{oLd5L7fXsB-!Nxse)v9Us?Q0QQk>j12CXCv!SZ8JTBd zrmTA?!1?cV3?Oj7a@SRNe4RtVQg+bt0>%-Rh)YxIU^CcitD$OVs-3>~eQ(2HX}m=O zLS1^ul2^MggnfMwxrH`$K^w1LqBEHAmV->KC=;y^le^kos{{1CT0S0hszx7q&?~fZ z)*ddcdivo#K2U3A`qtDpOs3kN;>E1@K39|Rrc-eLD29E2Oe98n!V4yxN5Bz!e{a0d;OtgxWU>2;`E{V5pqL-MM>1!4 zyTZVli<{;ajuflW4t@Er9gv$^aD?Bb!wq~v8fR-$7METPy?p<4bj&D!WRaGM9H)11 zi*Ec@Q-u`JDhnt{foq{b9R&rX&Uz;Z9f0>pey4ZpBX8Eyd%knClTqSjV(ob!Mq%RW z8+!w8aya7{X5kwdCXXLi!Z*J7=$BQCt6X}zKStT?tE`wy)sI13qcJhZexHnu8&m|9 zXkv6~VtQ6VXu1qvTwjZ(cVi=56ZQNYhK*>~XdWhi$?1+`yzH3Y<~MxIy&vqbl#4(o z<1cu@fp#bCud{g+J=)Xf_A?Q#1S%c%!x_|dudq;cq2rs}R;tDZc7`;& z?~RBccVP`(AkSD$Y44TVt*Y&3O=YxE(9Z+|2)oU~f5Pp99=IZ~<&f^^W>g;1;$DON z=G%Y0A0J!!G+h+_nvrg8hOWi5Qf=P3rF|C?4UohXdYk>dD>^jkaW*9Kf5EH{sfhfK zFi+4GIsMNkrWvY~t+OeqXu?22CxT}_Z(Q26xp)t72vVXT$D(zb_Ya!WXRvUA?V%9k z4BzU17+{jbzbe9@EBpkfv#H;l)t;V+P1AHaT6Av$PRw6QUB+50#8qil^*Ih<^&=*W zH451xyb(tKwPsFFwwe|S`d(Okf;>dmirOtz)K}bMog~0%Q@4=V#48LCg&w#8P&h|vuWwQDy zvHGmZ$WBI!ssSp!GhCGeO5SX?*WkQ6*XWNSHtIgujrJ5A*NG079I*f%WAz$VbGByy zpHYL9E+0xE?|?9Ko~N!>KEY98I{m0J|J`_IwSFpkS8q(5>MyW{2sP79onC*|RnjMUmo?NLmj+oZ{kUOh zNu$93NAPd1Rj^Jc%??~==v9n23i?aVh90E}pH0WHaY_1vQNuS!dK0UKHrEKo7a9%= z`InYHRxVYjFlS!c(<2K5KYfg0bisiJztK8QOnb5YJb8rem9U`A{Nm zLz`}SAOo$<8=-Tc(k%ee!*9miZd!i-lY{`RGuiSPoEDY%*BwirGSRi;Y5;^dc2A6_ zYxB-H^)t<8Lm3~cNgkdJJGwc2W(Rq46&%l(NT&?n=X^BANMSD~ONGsq#5wP8ua#90 z$}Bb!^Qa)78JNUZj?(Yq!lQ*>@`Y*mVy~M@V)9|e#Y2>9Q2x18pmWUEki`oj$xbB+oag@lwBLR#Ld;!|qcmPE z_xbmD2!ccz46udQw!P5^JzfA_$~>|YAQ3Ttqzm!yWT*S(9jYtL?}2rH9xXfleFcv^ z^V=B%7B9f9RRrrdU@G8i4E!`>sMM)D2fM!7NlJqd842 zL_m7nU|F;1OG3o3wk$sU1;;apL0}MwkqY8yB111f#$Onq`Wi6K-=E@NM1abcmhdT( zrw|vmlgrjg_;S$=R!HmLTLQF3n4u|G zcT-mU>&=0Qu69596;$a3m@&0^E{+<7jx2yFmKg@XuN-g4##lM8Ki9is>&r&x`V+OuOj2%HP=ooQ+Sp&mLK=@_6(DK5WKMr@tMJ$L@yy$n$Ng$d1mH(ONx5pfYyo!=;G|6IU@3XpTZ|A@8 zrVz1y(|Ie+mx^kp$|L0b0gR(-$C8(@FXY*`G*(x`tzYA)>Sm%O#(Mh8dGONV*$jB4 z`u_;N{zsCI^2IA`=N25LC$&1@oU?(4!{k=O_ zFE)rEwd^w_Ykq2AzAOr(aZLAqY+YRX7kwK@z zf9OaRSEmpnm#xY28tIJ#J@!yz*ni=|_3ho*dkIbuZcVFL-t2UTRt;)n5HRr4n9Wnn zpzCQxAdvuVXyUQQwl#7>eKi$CAs;aczCo3vOod52@5w%ZO6=#1W}evIwUV^g+kJ_g`tDd3|RPc4k@vL_8cx-i0sZ)(ACBI(;2O$bt*9VKtzu&}qn?ymwK5 zZkY;N`f?2eQ_8MPwVvJQqN>~Ys%{(!<8u(>zG?g4yZ`hZTh>o^gn06JWm9&C_n!YO zr)~dktN^9sS?su;dZzMdmW)yuRh3vW7(uc2#Kh}L650Do?4;keGFb{H&K?cRDC^_V>WFaSQOGJoTdZZmx?S4gu=n!fczD9u2Q3}CE>Pvy`WgBL{}jy^tPR8 zb>;n(9V~3@zRB8ZI)nT%r?5XdkrPB79Ux#>G49<9;|f&>+qr4tOis2S4H+5X3cg4~ zWD+^;ht@RVj-57u$3h9YACo?2^(@J@)Xq&&OYE`Z?65X~&SWFUB#S;<{>#jkGMKO9 zbY}oAD2WDUbcu7!N=G5dFTmLn*9ybEmeADPIP6|IplYt-On^V}kVK`hN4=ZS_gJiV zw;?q2HGiv)^ok$fliQOc;=Gr{GwR<;e&OGVPGwKB{K4Y9?$bDvBh1c-<0_3sBa2_9 z^caL)kGF~4Y>nk;`|2Ap8BfR=SdL_JLdn2w|2&sc2q<{9YcHCw@wQZ5EOTP3p_7l% zENe;Q{41ZIHj?rEsLsW^b>o zqMBjt7EV2Us(fueec=Qd76@-#JUX3eHxW_Jn^}YxtC*=vytv9@b1Ns6MZvCu*yiL! z1gr>{$k(t7PInXY!J-MdvAU-f#Pt8p&XWH1JgoiDhqzxii5Uy>1c7KGzuDRmxNf72 z#-E0LXY8$^gTOM?B4PW4fwLE`8q-%5G;NN@UMkXWC5q9zFMHFc*^nqix-iHn-Ueq&?3L!l4H&SK`u1q!CGWfZEous!E2;%7A z`S@09#Z+l)O^V%Jgl(RGh<=VE_&wtIuQkqvHy+@=&7IGsoVK*C>J#cZg1|VrsXX2l!Kr1bI z#8}Bhdj_J&iVh3ZqcsIJ+AK45rV);yH#tY(N6$|F`v40!yvs4oo7VQPxf12KH@oiX z)51vfjhHQ}8YL}o?5oSZ{gVISUDZcis}5w`VPWq7R%)_LW4NX=X!gIg7#JvWAsTwW zbnp7^J0R!juZt_N7s(2cvs$X;uvYXm1a+<#t9;0RubYaFEg4pjT=EhzWU;Lu^A|p~ zN}h%Cfj9=8OV9oyWDCTjnjJqzX{q)@n>h4rT7b_>C?qvCsgaVDK6Dy6`rZ5NB&qgjv z@3#uo>enXn^9QchOZTfiz}y#wb*E>+Hr2~c#8KAn#gmnVF%%q(#L;S`^ef{{i@pxa zt?d^CwcePOmfE%)k4I+q@>*>i85#(=SdstaPBpo4IlD*NCCHtq)7?QjrU{i<@ zP0wvMUo0Z((jyb(ro($W_Sw>JWzMcMvy=2t)em3om|gc&Av}4iq_&&BxCcr6SU^_% zY&e9lcIxVxY)9^Y(RLCG0CG0u#?Bk#y#1cdRNd?zj7bdN^Ni*clScEqu#rW367xAJ zSecV$qHnlWD(+j3v!qHKqYQZC@$PDecr$t? zjpD9Cv^1AjO7asNaUGJr963rOB;J6>xf(jxs06U{LS&embb5n$gu+5?RtUZL_Jf<1 z@K17Hd5LMD-Q`w*O{GW(J1;W}69&>2u%{Tj!b)yT)Zor=E-J@Dm}4w2 z6IXG6Z{zT`0AYpvH__YXd8htGBqiQA%iLrwwzEz%R`8=@$%J@@KCs`^${Om*W9QVs zsQ7QQvqfUm+I#&V^)LOBwH*ABu3hdaIh0Zed3mC@PVra=h9Ib@6N-}Y02R*P?SCxt z>8T*e8hhu4@!bgflFEeZuFA?u6w$YS7vfk1z^2c&%%3tXdXdDjpe1)!0v;+%FtO6WtdLH4EZ*P6>}dgv>QOCEUT{Vsevi0(`Fw4AkJnFv_(LD6 zWvi_7DLWKq{TG90;u=y9mu)aI`3fkYN=%aG3n)dCwzDK8zcOeQ#SmLjyGyl3z4Jq3 zk2`L2VnNn9(E0afwvU;T=5$s!(tHiUS7+elcy!<%HBR-HEHXmnl3lvmP&UaR$kcM& z%%94@bb3lPfc}F$SA+3b*;4yC6a&liue1>Rz1ghiLDO8SpN|jWeW@77=4lOPfAf~Y ztjDJ)^5kS_!fd_7capBt^QS>@aJjBv_uhvrrkWHR{Bv@$l{Ht7SB1{j43-~&;+9NS z*J}L%$EPNIget~JODTBlD*S~0@iJD`kac{NYuxQl6j`=oPPgN}zIZZHX}*_T#oDwI zA!qF@jPB0x!=eH_{FK)>UwLb{agCN;Q!m$LQy5t=kQ%0m>Cw5`d-^8_V1ij0Rni+R zFo+%=Z3}m@^8JJ2rj_bZqMMEe+V5S83~4JR>Cw?ttz*m`no5V4ZLo9r3KBRT`LwsKz1))IWJcFyK-Gxb*Do;2wYThV;e z6~QqtF@|$-2VO`>yE2bceEn0O(zS750LRw1a?=#Bab-$mf50Hi42N*isGYyINUGz7NXIV3VTfhaM?f>F)H(^lh zZZY>^onH@j)b-;maec~v_-|e^E-)86w? z(6zq8ZryuvcF!&2i{nEjm1j12lp-%rBUXfh^=C1(s#v05o{2~P%`7ek)=bSCCe8^I zoIi4=6K(oPGk@@6PG%@42CzK#d{OIJ)8OJWvP`+#wwPo3^m11`cCu^&(#6H`#Qaxn zHo%J*6So>=!FQFy5M-1#iCoF?v!fzB#E$jpc%wdfI(3-HadyZ-oZ=B0TOfMeUUd!x z8hn!Y;c+JN=CqD8p9rof5(;MS&9Q2( zC@YWgQuFxBp*;Zs4KAJyD zp-BO_5=7na1_~`+zigxY1pvrj{?!7Y?68I0;3gV8aL{~1eHjIn)^fzoKt^$D>cDHC zAcP;dYAMf}Yi@b=2OS=Ux|(LY&&20LjhB7(1m9Skdjp~bSG*-!c~l6+0%zqFiArzw zSE9mt`BKLwxUvc9Hw?LdIk(V*R#1u6vWqx}4vSaWVuUI*px4`%1KN+bk@GT5hQgmlrcaIhM_v`>vKaUn|n zl89-{7kaa@c~mT3BO?6i{vMI1WN7pGm#$<$61+I|m=Ue9e)LezUI<1E0+E>9^byC8 zvfWovH+ZfQ2)VR!sB8VJ%!}@!x78~-VL%VIvXm;WjwfnOpl|jV1y$*yIPy|9Fcbbl z3Tf8_1GSN~4%+qrAK7b7gnODaEwPblMk`BGh;&{3tkguym9JIoXb!EHvHFDEzxS5z#Ob97~ZMhf4F(Y8M4x+FmvMgR&K&HQzI*vF)s7Yu4< zp}!gD21oCz@CePKDwrjP?T%3mM-}{vlb}6le(g?IXik12oOD?PkCu8JU!Li9ScjiG zRW(LUfmsBrJzK=bci9=YM`XWgi$CpD@ZV%2o+h%xUDd=Mv|LWYX&pX0ApjdH;7#|T zPgL6;Dl4}eK@0uIP5%?q7HOlS;JQDb4JRUFO#sP6WPM*~=O0R=Q_2r%b*R(%%v{73 z)uta;_K6szEmI&7-n+2zk8UP{WN_5_4*g)AO3d^E5oX23qX((KXa)?}SZq*U!Ca=9 zr$DyPx9nt+i1L9Gl%JUz*pOEvsaBRk<8m=eH4Tbrau3Dwm?(iJBCOV*tr&hnZ6sIa zs${^hDaI(;K-{$zF$Em^V6N8_a(+z-P!TC}h9OGiQ?!vZt5@{A5})&bjibpuZQK3q z!h!P2^ndT{#XvJvbW30b!j`rsYM5;FQjf QC}IL+B^4#A#f*dh2b&<|(*OVf literal 0 HcmV?d00001 diff --git a/src/IECoreNuke/plugin/menu.py b/src/IECoreNuke/plugin/menu.py index 3eebf42561..4e19202811 100644 --- a/src/IECoreNuke/plugin/menu.py +++ b/src/IECoreNuke/plugin/menu.py @@ -49,7 +49,7 @@ import nuke nodesMenu = nuke.menu( "Nodes" ) - cortexMenu = nodesMenu.addMenu( "Cortex" ) + cortexMenu = nodesMenu.addMenu( "Cortex", icon="CortexMenu.png" ) cortexMenu.addCommand( "Display", "nuke.createNode( 'ieDisplay' )" ) cortexMenu.addCommand( "LensDistort", "nuke.createNode( 'ieLensDistort' )" )