Merge pull request #1232 from marktucker/dev_safe_usdimaging_get

Add some defensive coding when calling UsdImagingDelegate::Get (Internal change: 2076194)
PixarAnimationStudios · Jun 15, 2020 · f433d0b · f433d0b
2 parents a5c3a4f + c942104
commit f433d0b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pxr/usdImaging/usdImaging/delegate.cpp b/pxr/usdImaging/usdImaging/delegate.cpp
@@ -2327,8 +2327,8 @@ UsdImagingDelegate::Get(SdfPath const& id, TfToken const& key)
             // XXX(UsdImaging): We use cachePath directly as usdPath here,
             // but should do the proper transformation.  Maybe we can use
             // the primInfo.usdPrim?
-            TF_VERIFY(_GetUsdPrim(cachePath).GetAttribute(key)
-                      .Get(&value, _time),
+            UsdPrim prim = _GetUsdPrim(cachePath);
+            TF_VERIFY(prim && prim.GetAttribute(key).Get(&value, _time),
                       "%s, %s\n", id.GetText(), key.GetText());
         }
     }