Merge pull request #501 from mattyjams/pr/remove_support_for_Maya_rel…

…eases_older_than_2018 remove support for Maya releases older than 2018
Autodesk · May 20, 2020 · ddefcd4 · ddefcd4
2 parents 0681396 + 7cd3c48
commit ddefcd4
Show file tree

Hide file tree

Showing 33 changed files with 35 additions and 879 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -97,7 +97,7 @@ if (BUILD_USDMAYA_SCHEMAS)
     include(cmake/jinja.cmake)
 endif()
 
-find_package(Maya REQUIRED)
+find_package(Maya 2018 REQUIRED)
 find_package(USD REQUIRED)
 include(cmake/usd.cmake)
 include(${USD_CONFIG_FILE})

diff --git a/cmake/modules/FindMaya.cmake b/cmake/modules/FindMaya.cmake
@@ -278,8 +278,8 @@ find_package_handle_standard_args(Maya
         MAYA_PY_EXECUTABLE
         MAYA_INCLUDE_DIRS
         MAYA_LIBRARIES
-    VERSION_VAR
         MAYA_API_VERSION
+        MAYA_APP_VERSION
     VERSION_VAR
         MAYA_APP_VERSION
-)
+)
diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp
@@ -162,12 +162,7 @@ _GetShaderFromShadingEngine(
         return MObject();
     }
 
-    MObject shaderObj =
-#if MAYA_API_VERSION >= 20180000
-        shaderPlug.asMObject(&status);
-#else
-        shaderPlug.asMObject(MDGContext::fsNormal, &status);
-#endif
+    MObject shaderObj = shaderPlug.asMObject(&status);
     if (status != MS::kSuccess || shaderObj.isNull()) {
         return MObject();
     }

diff --git a/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp b/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp
@@ -195,49 +195,20 @@ class UseRegistryShadingModeExporter : public UsdMayaShadingModeExporter
                     continue;
                 }
 
-                // Note that MPlug's source() and destinations() methods were
-                // added in Maya 2016 Extension 2.
                 if (isDestination) {
-#if MAYA_API_VERSION >= 201651
                     srcPlug = iterPlug.source(&status);
                     if (status != MS::kSuccess) {
                         continue;
                     }
-#else
-                    MPlugArray srcPlugs;
-                    iterPlug.connectedTo(
-                        srcPlugs,
-                        /* asDst = */ true,
-                        /* asSrc = */ false,
-                        &status);
-                    if (status != MS::kSuccess) {
-                        continue;
-                    }
-
-                    if (srcPlugs.length() > 0u) {
-                        srcPlug = srcPlugs[0u];
-                    }
-#endif
 
                     dstPlugs.append(iterPlug);
                 } else if (isSource) {
                     srcPlug = iterPlug;
 
-#if MAYA_API_VERSION >= 201651
                     if (!iterPlug.destinations(dstPlugs, &status) ||
                             status != MS::kSuccess) {
                         continue;
                     }
-#else
-                    iterPlug.connectedTo(
-                        dstPlugs,
-                        /* asDst = */ false,
-                        /* asSrc = */ true,
-                        &status);
-                    if (status != MS::kSuccess) {
-                        continue;
-                    }
-#endif
                 }
 
                 // Since we are traversing the shading graph in the upstream

diff --git a/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp b/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp
@@ -427,11 +427,7 @@ UsdMayaTranslatorMayaReference::update(const UsdPrim& prim, MObject parent)
         command = MString("referenceQuery -f -withoutCopyNumber \"") + fnReference.name() + "\"";
         MGlobal::executeCommand(command, filepath);
         TF_DEBUG(PXRUSDMAYA_TRANSLATORS).Msg("MayaReferenceLogic::update referenceNode=%s prim=%s execute \"%s\"=%s\n",
-#if MAYA_API_VERSION < 201700
-            fnReference.name().asChar(),
-#else
             fnReference.absoluteName().asChar(),
-#endif
             prim.GetPath().GetText(),
             command.asChar(),
             filepath.asChar());

diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp
@@ -66,11 +66,7 @@ PxrMayaHdImagingShapeDrawOverride::~PxrMayaHdImagingShapeDrawOverride()
 MHWRender::DrawAPI
 PxrMayaHdImagingShapeDrawOverride::supportedDrawAPIs() const
 {
-#if MAYA_API_VERSION >= 201600
     return MHWRender::kOpenGL | MHWRender::kOpenGLCoreProfile;
-#else
-    return MHWRender::kOpenGL;
-#endif
 }
 
 /* virtual */
@@ -167,11 +163,7 @@ PxrMayaHdImagingShapeDrawOverride::prepareForDraw(
                 &status);
         if (status == MS::kSuccess) {
             const short selectionResolution =
-#if MAYA_API_VERSION >= 20180000
                 selectionResolutionPlug.asShort(&status);
-#else
-                selectionResolutionPlug.asShort(MDGContext::fsNormal, &status);
-#endif
             if (status == MS::kSuccess) {
                 UsdMayaGLBatchRenderer::GetInstance().SetSelectionResolution(
                     GfVec2i(selectionResolution));
@@ -184,11 +176,7 @@ PxrMayaHdImagingShapeDrawOverride::prepareForDraw(
                 &status);
         if (status == MS::kSuccess) {
             const bool enableDepthSelection =
-#if MAYA_API_VERSION >= 20180000
                 enableDepthSelectionPlug.asBool(&status);
-#else
-                enableDepthSelectionPlug.asBool(MDGContext::fsNormal, &status);
-#endif
             if (status == MS::kSuccess) {
                 UsdMayaGLBatchRenderer::GetInstance().SetDepthSelectionEnabled(
                     enableDepthSelection);
@@ -229,17 +217,12 @@ PxrMayaHdImagingShapeDrawOverride::draw(
     UsdMayaGLBatchRenderer::GetInstance().Draw(context, data);
 }
 
-// Note that isAlwaysDirty became available as an MPxDrawOverride constructor
-// parameter beginning with Maya 2016 Extension 2.
 PxrMayaHdImagingShapeDrawOverride::PxrMayaHdImagingShapeDrawOverride(
         const MObject& obj) :
-    MHWRender::MPxDrawOverride(obj,
-                               PxrMayaHdImagingShapeDrawOverride::draw
-#if MAYA_API_VERSION >= 201651
-                               , /* isAlwaysDirty = */ false)
-#else
-                               )
-#endif
+    MHWRender::MPxDrawOverride(
+        obj,
+        PxrMayaHdImagingShapeDrawOverride::draw,
+        /* isAlwaysDirty = */ false)
 {
 }
 

diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp
@@ -86,11 +86,7 @@ PxrMayaHdImagingShapeUI::getDrawRequests(
                 &status);
         if (status == MS::kSuccess) {
             const short selectionResolution =
-#if MAYA_API_VERSION >= 20180000
                 selectionResolutionPlug.asShort(&status);
-#else
-                selectionResolutionPlug.asShort(MDGContext::fsNormal, &status);
-#endif
             if (status == MS::kSuccess) {
                 UsdMayaGLBatchRenderer::GetInstance().SetSelectionResolution(
                     GfVec2i(selectionResolution));
@@ -103,11 +99,7 @@ PxrMayaHdImagingShapeUI::getDrawRequests(
                 &status);
         if (status == MS::kSuccess) {
             const bool enableDepthSelection =
-#if MAYA_API_VERSION >= 20180000
                 enableDepthSelectionPlug.asBool(&status);
-#else
-                enableDepthSelectionPlug.asBool(MDGContext::fsNormal, &status);
-#endif
             if (status == MS::kSuccess) {
                 UsdMayaGLBatchRenderer::GetInstance().SetDepthSelectionEnabled(
                     enableDepthSelection);

diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp
@@ -299,13 +299,10 @@ UsdMayaGL_InstancerShapeAdapter::_Sync(
             _rprimCollection.GetName());
     }
 
-    // The kBackfaceCulling display style was introduced in Maya 2016 SP2.
     HdCullStyle cullStyle = HdCullStyleNothing;
-#if MAYA_API_VERSION >= 201603
     if (displayStyle & MHWRender::MFrameContext::DisplayStyle::kBackfaceCulling) {
         cullStyle = HdCullStyleBackUnlessDoubleSided;
     }
-#endif
 
     _delegate->SetCullStyleFallback(cullStyle);
 

diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp
@@ -58,17 +58,12 @@ UsdMayaProxyDrawOverride::Creator(const MObject& obj)
     return new UsdMayaProxyDrawOverride(obj);
 }
 
-// Note that isAlwaysDirty became available as an MPxDrawOverride constructor
-// parameter beginning with Maya 2016 Extension 2.
 UsdMayaProxyDrawOverride::UsdMayaProxyDrawOverride(const MObject& obj) :
-        MHWRender::MPxDrawOverride(obj,
-                                   UsdMayaProxyDrawOverride::draw
-#if MAYA_API_VERSION >= 201651
-                                   , /* isAlwaysDirty = */ false),
-#else
-                                   ),
-#endif
-        _shapeAdapter(/* isViewport2 = */ true)
+    MHWRender::MPxDrawOverride(
+        obj,
+        UsdMayaProxyDrawOverride::draw,
+        /* isAlwaysDirty = */ false),
+    _shapeAdapter(/* isViewport2 = */ true)
 {
 }
 
@@ -82,11 +77,7 @@ UsdMayaProxyDrawOverride::~UsdMayaProxyDrawOverride()
 MHWRender::DrawAPI
 UsdMayaProxyDrawOverride::supportedDrawAPIs() const
 {
-#if MAYA_API_VERSION >= 201600
     return MHWRender::kOpenGL | MHWRender::kOpenGLCoreProfile;
-#else
-    return MHWRender::kOpenGL;
-#endif
 }
 
 /* virtual */
@@ -237,8 +228,6 @@ UsdMayaProxyDrawOverride::prepareForDraw(
     return _shapeAdapter.GetMayaUserData(oldData, boundingBoxPtr);
 }
 
-#if MAYA_API_VERSION >= 20180000
-
 /* virtual */
 bool
 UsdMayaProxyDrawOverride::wantUserSelection() const
@@ -312,8 +301,6 @@ UsdMayaProxyDrawOverride::userSelect(
     return true;
 }
 
-#endif // MAYA_API_VERSION >= 20180000
-
 /* static */
 void
 UsdMayaProxyDrawOverride::draw(

diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h
@@ -79,7 +79,6 @@ class UsdMayaProxyDrawOverride : public MHWRender::MPxDrawOverride
                 const MHWRender::MFrameContext& frameContext,
                 MUserData* oldData) override;
 
-#if MAYA_API_VERSION >= 20180000
         MAYAUSD_CORE_PUBLIC
         bool wantUserSelection() const override;
 
@@ -89,7 +88,6 @@ class UsdMayaProxyDrawOverride : public MHWRender::MPxDrawOverride
                 const MHWRender::MDrawContext& context,
                 MPoint& hitPoint,
                 const MUserData* data) override;
-#endif
 
         MAYAUSD_CORE_PUBLIC
         static void draw(

diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp
@@ -69,12 +69,8 @@ _ToMFrameContextDisplayStyle(const M3dView::DisplayStyle legacyDisplayStyle)
             displayStyle |= MHWRender::MFrameContext::DisplayStyle::kBoundingBox;
             break;
         case M3dView::kFlatShaded:
-// MHWRender::MFrameContext::DisplayStyle::kFlatShaded is missing in Maya 2015
-// and earlier. For those versions of Maya, fall through to kGouraudShaded.
-#if MAYA_API_VERSION >= 201600
             displayStyle |= MHWRender::MFrameContext::DisplayStyle::kFlatShaded;
             break;
-#endif
         case M3dView::kGouraudShaded:
             displayStyle |= MHWRender::MFrameContext::DisplayStyle::kGouraudShaded;
             break;
@@ -289,13 +285,8 @@ PxrMayaHdShapeAdapter::GetReprSelectorForDisplayState(
     const bool wireframeStyle =
         displayStyle & MHWRender::MFrameContext::DisplayStyle::kWireFrame;
 
-    // The kFlatShaded display style was introduced in Maya 2016.
     const bool flatShadedStyle =
-#if MAYA_API_VERSION >= 201600
         displayStyle & MHWRender::MFrameContext::DisplayStyle::kFlatShaded;
-#else
-        false;
-#endif
 
     if (flatShadedStyle) {
         if (!shadeActiveOnlyStyle || isActive) {
@@ -498,11 +489,9 @@ PxrMayaHdShapeAdapter::_GetVisibility(
     // If a view was provided, check to see whether it is being filtered, and
     // get its isolated objects if so.
     MSelectionList isolatedObjects;
-#if MAYA_API_VERSION >= 201700
     if (view && view->viewIsFiltered()) {
         view->filteredObjectList(isolatedObjects);
     }
-#endif
 
     // If non-empty, isolatedObjects contains the "root" isolated objects, so
     // we'll need to check to see if one of our ancestors was isolated. (The

diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp
@@ -273,13 +273,10 @@ PxrMayaHdUsdProxyShapeAdapter::_Sync(
             _rprimCollection.GetName());
     }
 
-    // The kBackfaceCulling display style was introduced in Maya 2016 SP2.
     HdCullStyle cullStyle = HdCullStyleNothing;
-#if MAYA_API_VERSION >= 201603
     if (displayStyle & MHWRender::MFrameContext::DisplayStyle::kBackfaceCulling) {
         cullStyle = HdCullStyleBackUnlessDoubleSided;
     }
-#endif
 
     _delegate->SetCullStyleFallback(cullStyle);
 

diff --git a/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp b/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp
@@ -281,7 +281,6 @@ MStatus HdVP2ShaderFragments::deregisterFragments()
 
     _registered = false;
 
-#if MAYA_API_VERSION >= 201700
     // Clear the shader manager's effect cache as well so that any changes to
     // the fragments will get picked up if they are re-registered.
     const MHWRender::MShaderManager* shaderMgr =
@@ -294,7 +293,6 @@ MStatus HdVP2ShaderFragments::deregisterFragments()
             return status;
         }
     }
-#endif
 
     return MS::kSuccess;
 }