Merge pull request #2408 from marktucker/dev_instance_unloaded_prim_b…

…boxes Allow instancing of bounding boxes drawn on prims with unloaded payloads (Internal change: 2291910)
PixarAnimationStudios · Aug 22, 2023 · 1a9f97f · 1a9f97f
2 parents 1c0c4d5 + 7dc3969
commit 1a9f97f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/pxr/usdImaging/usdImaging/delegate.cpp b/pxr/usdImaging/usdImaging/delegate.cpp
@@ -232,10 +232,11 @@ UsdImagingDelegate::_AdapterLookup(UsdPrim const& prim, bool ignoreInstancing)
     //    threads.
 
     TfToken adapterKey;
-    if (_displayUnloadedPrimsWithBounds && !prim.IsLoaded()) {
-        adapterKey = UsdImagingAdapterKeyTokens->drawModeAdapterKey;
-    } else if (!ignoreInstancing && prim.IsInstance()) {
+
+    if (!ignoreInstancing && prim.IsInstance()) {
         adapterKey = UsdImagingAdapterKeyTokens->instanceAdapterKey;
+    } else if (_displayUnloadedPrimsWithBounds && !prim.IsLoaded()) {
+        adapterKey = UsdImagingAdapterKeyTokens->drawModeAdapterKey;
     } else if (_hasDrawModeAdapter && _enableUsdDrawModes &&
                _IsDrawModeApplied(prim)) {
         adapterKey = UsdImagingAdapterKeyTokens->drawModeAdapterKey;

diff --git a/pxr/usdImaging/usdImaging/drawModeAdapter.cpp b/pxr/usdImaging/usdImaging/drawModeAdapter.cpp
@@ -1586,11 +1586,7 @@ UsdImagingDrawModeAdapter::GetTransform(UsdPrim const& prim,
     // the instance prim, but we want to ignore transforms on that
     // prim since the instance adapter will incorporate it into the per-instance
     // transform and we don't want to double-transform the prim.
-    //
-    // Note: if the prim is unloaded (because unloaded prims are drawing as
-    // bounds), we skip the normal instancing machinery and need to handle
-    // the transform ourselves.
-    if (prim.IsInstance() && prim.IsLoaded()) {
+    if (prim.IsInstance()) {
         return GfMatrix4d(1.0);
     } else {
         return BaseAdapter::GetTransform(