v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: removed misuse of "static" attribute preventing multithreaded usage of the importer 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@750 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
ulfjorensen 2010-06-04 14:05:06 +00:00
parent 175414f682
commit 219f9fadc6
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/ColladaLoader.cpp
View File

@ -1288,7 +1288,7 @@ const aiString& ColladaLoader::FindFilenameForEffectTexture( const ColladaParser
"Collada: Unable to resolve effect texture entry \"%s\", ended up at ID \"%s\".") % pName % name)); "Collada: Unable to resolve effect texture entry \"%s\", ended up at ID \"%s\".") % pName % name));
} }
static aiString result; aiString result;
// if this is an embedded texture image setup an aiTexture for it // if this is an embedded texture image setup an aiTexture for it
if (imIt->second.mFileName.empty()) if (imIt->second.mFileName.empty())

10
code/ColladaParser.cpp
View File

@ -157,7 +157,8 @@ void ColladaParser::ReadStructure()
while( mReader->read()) while( mReader->read())
{ {
// beginning of elements // beginning of elements
if( mReader->getNodeType() == irr::io::EXN_ELEMENT) { if( mReader->getNodeType() == irr::io::EXN_ELEMENT)
{
if( IsElement( "asset")) if( IsElement( "asset"))
ReadAssetInfo(); ReadAssetInfo();
else if( IsElement( "library_animations")) else if( IsElement( "library_animations"))
@ -185,7 +186,8 @@ void ColladaParser::ReadStructure()
else else
SkipElement(); SkipElement();
} }
else if( mReader->getNodeType() == irr::io::EXN_ELEMENT_END) { else if( mReader->getNodeType() == irr::io::EXN_ELEMENT_END)
{
break; break;
} }
} }
@ -2072,9 +2074,9 @@ void ColladaParser::ReadPrimitives( Mesh* pMesh, std::vector<InputChannel>& pPer
// gather that number of vertices // gather that number of vertices
for( size_t b = 0; b < numPoints; b++) for( size_t b = 0; b < numPoints; b++)
{ {
// read all indices for this vertex. Yes, in a hacky static array // read all indices for this vertex. Yes, in a hacky local array
assert( numOffsets < 20 && perVertexOffset < 20); assert( numOffsets < 20 && perVertexOffset < 20);
static size_t vindex[20]; size_t vindex[20];
for( size_t offsets = 0; offsets < numOffsets; ++offsets) for( size_t offsets = 0; offsets < numOffsets; ++offsets)
vindex[offsets] = *idx++; vindex[offsets] = *idx++;