Merge pull request #1513 from johnhaddon/usdPrimPathMessages

USD CurvesAlgo, MeshAlgo : Add prim path to warnings

Author: ericmehl

Changes

@@ -1,7 +1,10 @@
 10.6.x.x (relative to 10.6.3.1)
 ========
 
+Improvements
+------------
 
+- USDScene : Added prim path to warnings when reading curves and meshes.
 
 10.6.3.1 (relative to 10.6.3.0)
 ========

contrib/IECoreUSD/src/IECoreUSD/CurvesAlgo.cpp

@@ -110,7 +110,11 @@ IECore::ObjectPtr readBasisCurves( pxr::UsdGeomBasisCurves &curves, pxr::UsdTime
 		}
 		else
 		{
-			IECore::msg( IECore::Msg::Warning, "USDScene", boost::format( "Unsupported basis \"%1%\"" ) % usdBasis );
+			IECore::msg(
+				IECore::Msg::Warning, "USDScene",
+				boost::format( "Unsupported basis \"%1%\" reading \"%2%\"" )
+					% usdBasis % curves.GetPath()
+			);
 		}
 	}
 
@@ -125,7 +129,11 @@ IECore::ObjectPtr readBasisCurves( pxr::UsdGeomBasisCurves &curves, pxr::UsdTime
 	}
 	else if( wrap != pxr::UsdGeomTokens->nonperiodic )
 	{
-		IECore::msg( IECore::Msg::Warning, "USDScene", boost::format( "Unsupported wrap \"%1%\"" ) % wrap );
+		IECore::msg(
+			IECore::Msg::Warning, "USDScene",
+			boost::format( "Unsupported wrap \"%1%\" reading \"%2%\"" )
+				% wrap % curves.GetPath()
+		);
 	}
 
 	return readCurves( curves, time, basis, periodic, canceller );
@@ -205,7 +213,9 @@ bool writeCurves( const IECoreScene::CurvesPrimitive *curves, const pxr::UsdStag
 	}
 	else if ( curves->basis() != CubicBasisf::linear() )
 	{
-		IECore::msg( IECore::Msg::Warning, "USDScene", "Unsupported basis" );
+		IECore::msg(
+			IECore::Msg::Warning, "USDScene", boost::format( "Unsupported basis writing \"%1%\"" ) % path
+		);
 	}
 
 	if( !basis.IsEmpty() )

contrib/IECoreUSD/src/IECoreUSD/MeshAlgo.cpp

@@ -141,7 +141,10 @@ IECore::ObjectPtr readMesh( pxr::UsdGeomMesh &mesh, pxr::UsdTimeCode time, const
 			// within a single crease, rather than just a sharpness per crease. We don't know how
 			// we would author one of these in practice (certainly not in Maya), and we're not sure
 			// why we'd want to. For now we ignore them.
-			IECore::msg( IECore::Msg::Warning, "USDScene", "Ignoring creases with varying sharpness" );
+			IECore::msg(
+				IECore::Msg::Warning, "USDScene",
+				boost::format( "Ignoring creases with varying sharpness on \"%1%\"" ) % mesh.GetPath()
+			);
 		}
 	}