Merge pull request #4069 from Autodesk/lanierd/HYDRA-1347-REVERT

HYDRA-1347 : Fully revert the changes from PR #4060.

lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp

@@ -542,20 +542,6 @@ bool _DrawItemFilterPredicate(const SdfPath& rprimID, const void* predicateParam
 
 bool _longDurationRendering = false;
 
-bool _IsVP2RenderDelegate()
-{
-    bool                  isVP2RenderDelegate = true;
-    MHWRender::MRenderer* theRenderer = MHWRender::MRenderer::theRenderer();
-    if (theRenderer) {
-        const MString overrideName = theRenderer->activeRenderOverride();
-        isVP2RenderDelegate
-            = (0 == overrideName.length()); // Having a non empty render override name means we are
-                                            // not using the VP2 render delegate
-    }
-
-    return isVP2RenderDelegate;
-}
-
 } // namespace
 
 //! \brief  Draw classification used during plugin load to register in VP2
@@ -634,9 +620,6 @@ bool ProxyRenderDelegate::requiresUpdate(
 
 void ProxyRenderDelegate::_ClearRenderDelegate()
 {
-    if (!_isInitialized())
-        return;
-
     // The order of deletion matters. Some orders cause crashes.
 
     _sceneDelegate.reset();
@@ -1241,12 +1224,6 @@ void ProxyRenderDelegate::update(MSubSceneContainer& container, const MFrameCont
     if (_proxyShapeData->ProxyShape() == nullptr)
         return;
 
-    const bool isVP2RenderDelegate = _IsVP2RenderDelegate();
-    if (!isVP2RenderDelegate) {
-        _ClearRenderDelegate(); // Free resources if we are not using VP2 render delegate
-        return;
-    }
-
     // If the rendering was flagged as possibly taking a long time,
     // show the wait cursor.
     //