Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- SpatialSort generation now notifies the logger.

Browse Source 
- Fix VC10 incompatibility in BlenderDNA (0 to ptr-to-mem conversion fails). Thanks to Krishty to point it out.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@775 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2010-07-09 17:49:29 +00:00
parent b18d782231
commit 8881d5f752
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/BlenderDNA.cpp
View File

@@ -292,7 +292,7 @@ DNA::FactoryPair DNA :: GetBlobToStructureConverter(
) const
{
std::map<std::string, FactoryPair>::const_iterator it = converters.find(structure.name);
return it == converters.end() ? FactoryPair(NULL,NULL) : (*it).second;
return it == converters.end() ? FactoryPair() : (*it).second;
}
// basing on http://www.blender.org/development/architecture/notes-on-sdna/