From 08ea7b86768fc70484e0e59be844d6d6d00f6a49 Mon Sep 17 00:00:00 2001
From: Jerry Gamache <jerry.gamache@autodesk.com>
Date: Tue, 15 Oct 2024 15:40:15 -0400
Subject: [PATCH] Add support for OpenPBR as default material

---
 .../basisCurveInstance_selected.png              | Bin 0 -> 4337 bytes
 .../basisCurveInstance_unselected.png            | Bin 0 -> 4307 bytes
 .../defaultMaterialBillboards_default.png        | Bin 0 -> 5838 bytes
 ...defaultMaterialBillboards_defaultSelected.png | Bin 0 -> 5777 bytes
 ...tVP2RenderDelegatePerInstanceInheritedData.py |   5 ++++-
 5 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_selected.png
 create mode 100644 test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_unselected.png
 create mode 100644 test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_default.png
 create mode 100644 test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_defaultSelected.png

diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_selected.png b/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc65a767e4c470a8477827b16709c018f0556ecd
GIT binary patch
literal 4337
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

literal 0
HcmV?d00001

diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_unselected.png b/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_unselected.png
new file mode 100644
index 0000000000000000000000000000000000000000..e75ca48135fcd99f466c6ee1d64b3e1641509beb
GIT binary patch
literal 4307
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
T2(g*`e-WTxnYp56xuN2}TJq7r

literal 0
HcmV?d00001

diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_default.png b/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d0e1bdcfcc2bf3b01ab6200d282228444d5a88e
GIT binary patch
literal 5838
zcmeHL`Bzid7Cs>og9IfqML;CR0R$unDoDT-FeoUXRUS%}AOa2ydD1G702dpkmO<ZB
z1Vun&TdE)^Rj?9?5k(~$unOW3NEJaXCX8X`?Mr{|TJH~#wYa%w*!%47J7<6UBv}D|
z-g<LP=OBdiHf{9Uh7eJLkd`@_1U)Xh8~N}tH#}%l#Fi~+1-z5tAOCy$^?%{16U*Vm
z&9w2y%M~}CAY{CGlh;?<<BNLV_+Bw<GfLmOX{+OIJ|}fG=2Xe)jv-kx91s8gf#g$G
zU>uwE&dyjq9&(w%R*OC>mj#p@IgvQs-`_tMyaj5`Yqa5$t*b>t2qS-aeqrDX1OLRp
zB7O)$^6~zzrnW=%(;xo$MN?6!jkw#jXxwcz7c?)|GlT>*iz#s$o~0^I`4@$Veub8#
zI7{I+y~TlomQW?=`(LTz*vWb!6CGzGBBeBZ@b=KO$z3G5G>gezE*5EwgF_K_hZe2$
z#MbZsZmfpJh4u>?V{lOpMus<h1{Hr&4<K$Jj9|}28dKb6jTWsFYv>ev!@7?866Bht
zNMbG4L)kuv_?n)WS8YT>90o@C?3{5{-<>m}g%}WzD_J?|WsjIE2oyEeRBLdzBWn-h
zlE7E#U`17rHi`g~;**Bb3nr+b5Rt6*J#Q2Rb5s>^1`5R1QHAW;lNdsjT#KM6Ew0|w
z6ag?bg+OV3@W6p}cu=u8oq&1kaIyOw9pwT52N3?EV}x}ds8X8^s?{DeRO^k?5V7Qn
zg}5dYVE97w;&$hsIV!uoG~|p^mgr=)LG=ne?=yhbEtA3v8fS2n0OWf4^;su2&6lF%
zo`}eM{-}ljBaMVzPx>o~fU+45iT1mvCcsTAfRO&=t+MNmqe@ZLTmnUZ<KX8=8w&aa
zOwqkm0}V_h>-ALWqEh$1;9^H@Z1e>p&T@{m+3;#0Dw)9DqeZiP5MGxx!&doMh$y^f
zlzdjLja?^mG2RVnCD0ah8j(8ve+^c)wv3mAOpo;nru#=b_L?En`4Ti?8EW%7><|8&
zj+CjvyrZh*v4NV~Q@tT6CQ{V=VEpvy(~34EnH8v`-1ABitK>IY3;iLeXApV(gKRqM
z;0&3i5V|Ck(a5XxF7mIp(Ce_HQ&6}L7ZtDBMwZ`zdO#sc24*qQhM`R5j=u?SBy-WF
zvV~F`)}Ir$Fg*`A-M(X$aDyrus8KA#2>ajfryQMh<u8AyGA3c4!2EHqPUtH|cl#Wo
z<d7B(yRtGYXt0%$PJrX5fAGC`QArn^zil%#H$S=@t@0OF{#>$NI(@l<i4K6huYtH`
zca-EF6H)P&&uCPvb$8rY2sy=dEuA9y0XmzidXtJ_x(#gV<}EYcgC1unOz<ja2jnxa
z4{-V?+IN(U+BLm5!A=2+{3<=AfrCKilISnAM>c@NwrkaksI*04uXH6Jai9J1gYHrj
z%n)MkN??t7Tf~tpPau+IdZTDOmR~Oz?H~H%7yn~s*h)oxUESbq66$$Bp&^%)o8Dza
z@%@#zCf(>1Hb6#Gyj<lDk9c9UN|6#sAvPaFBrK<}Mk<QoFQTUt$~Hg|UsxTL#*gLu
z7tibi`v3?*XtyPGzT9lJke?Czp+|g=LJR=QAeq>bN|l=_`+AHl;*!%{NS#&$N)<W8
z`PrUN6+Bh6YLi_3W>q6%L9%X^oz}}a|31(;>D8^%J4xJm1PZgz)M2s3BkSu%H+tRf
z+Y)(sh*Ti7H#^hRqHlb=s~{ZRz?DYO(mXNDvgmc_9+Nqu<q!^2l$Ob}io6AO(Q+0M
zPat9e-9zZ<(hY`5g$FPeXozSh!^>HApf%ypoz293kP$f*hV%=eb8Q}f6CGj7jfN?y
z&xu}6*$0MhUVi)yu^e)C`$=QVW9RFCD?D^BiijtK;WBoE$GrDf^s4okYYCJ9Y@~Jz
z^I7=tn8PbHF#2L#3q>q*R~&I?Tn#85C1Q=R#paf*T<V>nf`><B4w5=RVBpp0e(d~0
z$DMgDq=FJq8}_#o8*K+8S2i)5W>QsKXYN(z;<$wDounY(pv=<FStw;ajTj&gP^wnK
zsx2R{(hc8VAB%E-WIF>zuiVhg&ht*l`RyG()d>w&)#0s#mjF@kvALO>v_|vY#li&l
zMXMi~7k-BUiR{_c!uwV&{2b@9$ox^(Ug1rLPiPWyJeQ-FbK>q%U-M_HKW4ih6uMad
zJD)LOjvR4HY4lYQKPV0fzuL`^^-vkIw1nBT3`C-B%zIGaCa9#&9+J(MGGrKZL)5f@
zUbAi^knPZbwoC_>^ia%u!u_QfffP8#S+`VB;{|T&S{Zfs8AW&7$=w9zVmJY*kul|8
zgU!}}kfsH+t|2E48UPpu3GX<;BZ_6@kC$BxM0Ls4k0&2mMb2*i5e`Umg_){#ZH*&I
zl5bg7`K&0re^((NO8_~}Iv3jz%`aI_{^+{SRaCboVi7kPQf7Ccc(h|aaj5s)Ph0o=
zc(Q%{f-V{1Af(yrli$9rUpnh$?V2!Ak$7}A&VA?Xhij+WGE>L=9M?W_IXm6PN!X2i
zASA)tpQocexX}utrZ9!84Z>M;cB)Y)^?Lj~))PJ|IE6^$cj@&MDs!#s`&D)GutGr(
z$n|gC>8JMnqBg4Ua`xvgTO&cr*R}5V7g@-f%4^;xY2jr|o#R|9*PE=99SKpmN;X2m
zS7xTQy{?lt+2-Bj>(Ejms!Q+Uc_R1vccTl>X-t~`3q4mZ9_NMKF1|R^!_)!+U1^iy
z)nqmhk}^5;+$DKxVyB@~RsTe;--s4o5?T8OkH=3ZPm71`>nEPF1SwOa-T$he9#_?;
zjPD@VIF3;&Jzyqiy7^(d#THreJ-axnht`6c7Jid;dK%Bwqt>ENcP8GG9m(U-KV;HE
zA(Jb3{JpglrEaz#A_g>+(OF-Q#ONr8bD#9JReI*8I7&?l(h#Y%jOtO_8203s5Z^Ra
zzJ5&Qkh$En8OCy8><0@vtG}D?+vlPj=8Slr3r<X{R%=JV(J8yMfwe@48^pfTPi}B*
zu@$7YLs>XeMxE!Fa=XSb&s%fVhobuT+=xD1{1VaptXf(15`0mmNlS#hPa1Rf7B~Sb
zE%Y)P8jJG!<G<zGq*tl61D9Zgo{tqg{o9Q?O81DoP^E79W)Np#w9|+n*2N<4bJz_~
z5;oAvE`JXBLDo1Prs#%PW`XMZ?ZP1@b96)dbT0z44M86U#6OJ`@z%SA1&wII?Fjk$
zb_{<Gw|VW~gnL;BoAV!`%E6<y<P6<bK$!AJ#41B&aJv5I%iF;#)`pv?M-_<zzuFQJ
zKIO_dE-j@ezb?z_y!PZQcdVAuE_Sd@Cd5<|NL*`+)RlJ`&2N7<l1fcFLCCPBI?6Di
ziuDAy9fsVs-9lC|1cZ&9j_}@V{_V6bi!Ml0YtH~Urk}iJMC<rQsCrA?glYEZA*_Gm
zsYh+($k?@Ih@<qaLY;4Z56NHc0Z2npB7o$Dp3=8)5Yz~nr~-DNc5kbGF&#AEF8a+9
zBXs8O^oVa&zkw^uGoY56vDGvF)Za~flpqqSFDY*=6%wpAL4hH3>$@K?y4&63w$p9K
z<5H-C@!NVUc=DN&A?8qsypvFwJbW^$)M9@!Q4MtkrMa0&r5Xnh8YYH#xA*TS>vnXL
zLy=-JMku{j;}JBHzdW5#%Rxjo;}!5e1fj2lSoi;BE|u0SgaQq_hv{d{1afVr%CmP%
zHMa(Kl0&i0P#ley3Sw`u%p55AwM(*Bs0xcpBOHd<f`sa%TzygyXgBsyr{kKCDft~j
z*z7aX+7%~7pGKQuv#`djjvGa5C8kk8fJb-EMdoGsunBh|I9|3)_=$QOeF7e<5dE86
zwKjgK!qUjfw?cc#m_WxE+4dO59gA5XseSwo2_lJL2ujr24*;1ZHnUs%ATjmdt(ur0
zR(o`$SYD_34qe2*@ID<kMOf~9kJ_U=#k#kOHtpkpA9a+QO5GT7s=_&;*cymb{b&XK
zwd;z!qA=AVQqVa>LRZc}G56k=758b<5tV}qp`(xIOU0tAtu8}TH&Gz0jP2&=DHW+N
zK7NxpU4(2v10|lEIZDOW7jJD7r)4uWLPB@*tUWp_SDk^xa>V5T*m$2N+FuKk7(&%*
zv0R&L3|&?iBFu;9)@{9e^s>f<fJ+71a4P#A^;k^)h}cPblaLK(5$#}^<%$_G_tkGc
zCZ!`0kj37Sm%dN6KbS74Ni4CJSOJpehTzb4*QbG$jzfthj%<JMzW<=v8OE%gJ`;OP
zm9GiA;PkW08}P%&{!gCR9--3J%JDa&wn8TU-2^!ZRney-8R@Azl5l-Sc9|WMevw^u
zm{B{7`WhT=OkkM?fi9u^C4wfZRI&nA#j`a}pA@kiSP9SUSR)8EX4=4!-0VLx9A-n2
zHPo<)NbQtDCdeePeFchyaVzOq)ueVrD3O9}-x}`STW;5_Cu@Mgpxhi@5=b9h;86Zj
zVUxjaiHxPChiv7dmT+fJ?hz;wY>FA=vwhVZGcK~s%~2;m(Fw}ZV<P<~&d3_jst4dF
zGm<fJrWyr?!wTw*!5m!HAU?F_DP)3{HSUt<DHXL`o))0fa3+zW>Q4@gWZ~~ec7-$Q
zq;kX)f>+7+5pT#KZs+j#uN<R=kvILYGx)S(r+(Z-fcu@Zz#6ndk_U9KLr?d$Gt%$b
zOTGjCOE2UHgMji%?C)ry{iVYu5m_Nv4bG<1_Cy9QNT6A$r?i0+G@-@1522Te7-qOd
zHc&v56hp2ec^}ycN!T%Nrgq7M;z+>6w7jDmPz)iVncMc4=NAUPFz|(e|C50!-IH#c
ZeHL6A+zR^f&p$(>O&k2Yu6S^d{SRN&_ICgP

literal 0
HcmV?d00001

diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_defaultSelected.png b/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_defaultSelected.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef916b710b11b4d5e954f28f9fbc8cb053f3b642
GIT binary patch
literal 5777
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

literal 0
HcmV?d00001

diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegatePerInstanceInheritedData.py b/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegatePerInstanceInheritedData.py
index 0a13e5e448..ea413f07d1 100644
--- a/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegatePerInstanceInheritedData.py
+++ b/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegatePerInstanceInheritedData.py
@@ -56,8 +56,11 @@ def setUpClass(cls):
         cls._testDir = os.path.abspath('.')
 
         cls._imageVersion = None
-        if maya.mel.eval("defaultShaderName") != "standardSurface1":
+        defaultSurfaceName = maya.mel.eval("defaultShaderName")
+        if defaultSurfaceName == "lambert1":
             cls._imageVersion = 'lambertDefaultMaterial'
+        elif defaultSurfaceName == "openPBRSurface1":
+            cls._imageVersion = 'openPBRSurfaceDefaultMaterial'
 
     @classmethod
     def tearDownClass(cls):