From 2e909b35d8d20a7f2ee2270a10b30265337aeb0d Mon Sep 17 00:00:00 2001 From: ulfjorensen Date: Mon, 7 Jun 2010 14:02:56 +0000 Subject: [PATCH] Bugfix: Collada node instances are correctly loaded and resolved now. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@752 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/ColladaParser.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/ColladaParser.cpp b/code/ColladaParser.cpp index d6aa67d57..46f7dadce 100644 --- a/code/ColladaParser.cpp +++ b/code/ColladaParser.cpp @@ -2264,9 +2264,9 @@ void ColladaParser::ReadSceneNode( Node* pNode) int attrID = TestAttribute( "id"); if( attrID > -1) child->mID = mReader->getAttributeValue( attrID); - int attrSID = TestAttribute( "sid"); - if( attrSID > -1) - child->mSID = mReader->getAttributeValue( attrSID); + int attrSID = TestAttribute( "sid"); + if( attrSID > -1) + child->mSID = mReader->getAttributeValue( attrSID); int attrName = TestAttribute( "name"); if( attrName > -1) @@ -2284,7 +2284,7 @@ void ColladaParser::ReadSceneNode( Node* pNode) { // no parent node given, probably called from element. // create new node in node library - mNodeLibrary[child->mID] = pNode = child; + mNodeLibrary[child->mID] = child; } // read on recursively from there