Merge branch 'RB-10.5'

Author: johnhaddon

Changes

@@ -24,11 +24,19 @@ Breaking Changes
 - IECoreNuke : Removed.
 - Removed support for `IECORE_RTLD_GLOBAL` environment variable.
 
-10.5.x.x (relative to 10.5.15.0)
+10.5.x.x (relative to 10.5.15.1)
 ========
 
 
 
+10.5.15.1 (relative to 10.5.15.0)
+=========
+
+Fixes
+-----
+
+- USDScene : Fixed reading of bounds from prims with `extentsHint` and model `kind` but without UsdGeomModelAPI applied.
+
 10.5.15.0 (relative to 10.5.14.1)
 =========
 

contrib/IECoreUSD/src/IECoreUSD/USDScene.cpp

@@ -627,7 +627,8 @@ pxr::UsdAttribute boundAttribute( const pxr::UsdPrim &prim )
 
 	if( g_useModelAPIBounds )
 	{
-		if( auto modelAPI = pxr::UsdGeomModelAPI( prim ) )
+		pxr::UsdGeomModelAPI modelAPI( prim );
+		if( modelAPI || prim.IsModel() )
 		{
 			return modelAPI.GetExtentsHintAttr();
 		}

contrib/IECoreUSD/test/IECoreUSD/USDSceneTest.py

@@ -4425,11 +4425,18 @@ def testModelBound( self ) :
 		pxr.UsdGeom.Xform.Define( stage, "/withoutModelAPI" )
 		pxr.UsdGeom.Xform.Define( stage, "/withModelAPI" )
 		pxr.UsdGeom.Xform.Define( stage, "/withModelAPIAndExtent" )
+		pxr.UsdGeom.Xform.Define( stage, "/withKind" )
+		pxr.UsdGeom.Xform.Define( stage, "/withKindAndExtent" )
 
 		pxr.UsdGeom.ModelAPI.Apply( stage.GetPrimAtPath( "/withModelAPI" ) )
 		modelAPI = pxr.UsdGeom.ModelAPI.Apply( stage.GetPrimAtPath( "/withModelAPIAndExtent" ) )
 		modelAPI.SetExtentsHint( [ ( 1, 2, 3 ), ( 4, 5, 6 ) ] )
 
+		stage.GetPrimAtPath( "/withKind" ).SetKind( "group" )
+		stage.GetPrimAtPath( "/withKindAndExtent" ).SetKind( "group" )
+		modelAPI = pxr.UsdGeom.ModelAPI( stage.GetPrimAtPath( "/withKindAndExtent" ) )
+		modelAPI.SetExtentsHint( [ ( 1, 2, 3 ), ( 4, 5, 6 ) ] )
+
 		stage.GetRootLayer().Save()
 		del stage
 
@@ -4440,6 +4447,9 @@ def testModelBound( self ) :
 		self.assertFalse( root.child( "withModelAPI" ).hasBound() )
 		self.assertTrue( root.child( "withModelAPIAndExtent" ).hasBound() )
 		self.assertEqual( root.child( "withModelAPIAndExtent" ).readBound( 0 ), imath.Box3d( imath.V3d( 1, 2, 3 ), imath.V3d( 4, 5, 6 ) ) )
+		self.assertFalse( root.child( "withKind" ).hasBound() )
+		self.assertTrue( root.child( "withKindAndExtent" ).hasBound() )
+		self.assertEqual( root.child( "withKindAndExtent" ).readBound( 0 ), imath.Box3d( imath.V3d( 1, 2, 3 ), imath.V3d( 4, 5, 6 ) ) )
 
 	def testAnimatedModelBound( self ) :