Merge pull request #3872 from boberfly/fixes/msvc2022fixes

MSVC 2022 compiler fixes + minor correction for older Hydra APIs
Autodesk · Sep 18, 2024 · a17e33d · a17e33d
2 parents 6925a50 + 35839c2
commit a17e33d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp
@@ -96,7 +96,7 @@ UsdMayaProxyDrawOverride::transform(const MDagPath& objPath, const MDagPath& cam
         GfMatrix4d rootXform(transform.matrix);
 
         MayaUsdProxyShapeBase* pShape = MayaUsdProxyShapeBase::GetShapeAtDagPath(objPath);
-        if (pShape and pShape->usdPrim().GetPath() != SdfPath::AbsoluteRootPath()) {
+        if (pShape && pShape->usdPrim().GetPath() != SdfPath::AbsoluteRootPath()) {
             // If we're not computing the transform of the root of the Usd
             // scene, apply the usdPrim transform from within the scene
             const UsdTimeCode timeCode = pShape->getTime();

diff --git a/lib/usd/hdMaya/adapters/dagAdapter.cpp b/lib/usd/hdMaya/adapters/dagAdapter.cpp
@@ -106,11 +106,11 @@ void _InstancerNodeDirty(MObject& node, MPlug& plug, void* clientData)
 
 const auto _instancePrimvarDescriptors = HdPrimvarDescriptorVector { {
 #if HD_API_VERSION < 56
-    HdInstancerTokens->instanceTransform
+    HdInstancerTokens->instanceTransform,
 #else
     HdInstancerTokens->instanceTransforms,
 #endif
-        HdInterpolationInstance,
+    HdInterpolationInstance,
     HdPrimvarRoleTokens->none } };
 
 } // namespace

diff --git a/plugin/pxr/maya/lib/usdMaya/translatorModelAssembly.cpp b/plugin/pxr/maya/lib/usdMaya/translatorModelAssembly.cpp
@@ -235,7 +235,7 @@ bool UsdMayaTranslatorModelAssembly::Create(
 
     if (!assemblyEdits.empty()) {
         std::vector<std::string> failedEdits;
-        const bool               needsLoadAndUnload = not prim.IsLoaded();
+        const bool               needsLoadAndUnload = !prim.IsLoaded();
 
         // the prim must be loaded in order to apply edits.
         if (needsLoadAndUnload) {