Merge pull request #186 from andrewkaufman/expandLinkErrorMessage

Adding mainScene filename to error message in expandLink

Author: johnhaddon

include/IECore/LinkedScene.h

@@ -156,7 +156,7 @@ class LinkedScene : public  SampledSceneInterface
 
 		LinkedScene( SceneInterface *mainScene, const SceneInterface *linkedScene, int rootLinkDepth, bool readOnly, bool atLink, bool timeRemapped );
 
-		static ConstSceneInterfacePtr expandLink( const StringData *fileName, const InternedStringVectorData *root, int &linkDepth );
+		ConstSceneInterfacePtr expandLink( const StringData *fileName, const InternedStringVectorData *root, int &linkDepth );
 
 		// uses the mainScene to ask what is the time the link is remapped to. Should only be called when the linkAttribute is available.
 		double remappedLinkTime( double time ) const;

src/IECore/LinkedScene.cpp

@@ -940,7 +940,7 @@ ConstSceneInterfacePtr LinkedScene::expandLink( const StringData *fileName, cons
 		}
 		catch ( IECore::Exception &e )
 		{
-			IECore::msg( IECore::MessageHandler::Error, "LinkedScene::expandLink", e.what() );
+			IECore::msg( IECore::MessageHandler::Error, "LinkedScene::expandLink", std::string( e.what() ) + " when expanding link from file \"" + m_mainScene->fileName() + "\"" );
 			linkDepth = 0;
 			return 0;
 		}