Merge pull request #1435 from johnhaddon/usdVolumeFix

USD VolumeAlgo : Fix crash loading empty field

Changes

@@ -1,7 +1,10 @@
 10.5.x.x (relative to 10.5.9.3)
 ========
 
+Fixes
+-----
 
+- USDScene : Fixed crash loading a Volume with an empty field.
 
 10.5.9.3 (relative to 10.5.9.2)
 ========

contrib/IECoreUSD/src/IECoreUSD/VolumeAlgo.cpp

@@ -98,8 +98,11 @@ IECore::ObjectPtr readVolume( pxr::UsdVolVolume &volume, pxr::UsdTimeCode time,
 			continue;
 		}
 
-		ConstDataPtr fieldFileNameData = DataAlgo::fromUSD( fieldAsset.GetFilePathAttr(), time );
-		const std::string fieldFileName = static_cast<const StringData *>( fieldFileNameData.get() )->readable();
+		std::string fieldFileName;
+		if( auto fieldFileNameData = runTimeCast<const StringData>( DataAlgo::fromUSD( fieldAsset.GetFilePathAttr(), time ) ) )
+		{
+			fieldFileName = fieldFileNameData->readable();
+		}
 
 		if( fileName.empty() )
 		{

contrib/IECoreUSD/test/IECoreUSD/USDSceneTest.py

@@ -4398,5 +4398,12 @@ def testUsdVolVolumeSlashes( self ) :
 		self.assertNotIn( "\\", vdbObject.fileName() )
 		self.assertTrue( pathlib.Path( vdbObject.fileName() ).is_file() )
 
+	@unittest.skipIf( not haveVDB, "No IECoreVDB" )
+	def testUsdVolVolumeWithEmptyField( self ) :
+
+		fileName = os.path.dirname( __file__ ) + "/data/volumeWithEmptyField.usda"
+		root = IECoreScene.SceneInterface.create( fileName, IECore.IndexedIO.OpenMode.Read )
+		self.assertIsNone( root.child( "volume" ).readObject( 0 ) )
+
 if __name__ == "__main__":
 	unittest.main()

contrib/IECoreUSD/test/IECoreUSD/data/volumeWithEmptyField.usda

@@ -0,0 +1,11 @@
+#usda 1.0
+
+def Volume "volume"
+{
+    custom rel field:density = </volume/density>
+
+    def OpenVDBAsset "density"
+    {
+    }
+}
+