Merge pull request #152 from LumaPictures/pr/select_render_guides

if renderGuides are shown, they should be selectable
AnimalLogic · Aug 29, 2019 · 44ce80e · 44ce80e
2 parents ffca007 + 9d681e9
commit 44ce80e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.cpp b/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.cpp
@@ -564,13 +564,16 @@ bool ProxyDrawOverride::userSelect(
   MMatrix invMatrix = objPath.inclusiveMatrixInverse();
   GfMatrix4d worldToLocalSpace(invMatrix.matrix);
 
-  UsdImagingGLRenderParams params;
 
   auto* proxyShape = static_cast<ProxyShape*>(getShape(objPath));
   auto engine = proxyShape->engine();
   if (!engine) return false;
   proxyShape->m_pleaseIgnoreSelection = true;
 
+  UsdImagingGLRenderParams params;
+  // Mostly want to get render params to set renderGuides/proxyGuides/etc
+  proxyShape->getRenderAttris(params, context, objPath);
+
   UsdPrim root = proxyShape->getUsdStage()->GetPseudoRoot();
 
   Engine::HitBatch hitBatch;

diff --git a/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp b/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp
@@ -319,7 +319,6 @@ bool ProxyShapeUI::select(MSelectInfo& selectInfo, MSelectionList& selectionList
   MDagPath selectPath = selectInfo.selectPath();
   MMatrix invMatrix = selectPath.inclusiveMatrixInverse();
 
-  UsdImagingGLRenderParams params;
   MMatrix viewMatrix, projectionMatrix;
   GfMatrix4d worldToLocalSpace(invMatrix.matrix);
 
@@ -334,6 +333,10 @@ bool ProxyShapeUI::select(MSelectInfo& selectInfo, MSelectionList& selectionList
   if (!engine) return false;
   proxyShape->m_pleaseIgnoreSelection = true;
 
+  UsdImagingGLRenderParams params;
+  params.showGuides = proxyShape->displayGuidesPlug().asBool();
+  params.showRender = proxyShape->displayRenderGuidesPlug().asBool();
+
   UsdPrim root = proxyShape->getUsdStage()->GetPseudoRoot();
 
   Engine::HitBatch hitBatch;