- SpatialSort generation now notifies the logger.
- 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-9d2fd5bffc1fpull/1/head
parent
b18d782231
commit
8881d5f752
|
@ -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/
|
||||
|
|
|
@ -527,7 +527,8 @@ class ComputeSpatialSortProcess : public BaseProcess
|
|||
|
||||
void Execute( aiScene* pScene)
|
||||
{
|
||||
typedef std::pair<SpatialSort, float> _Type;
|
||||
typedef std::pair<SpatialSort, float> _Type;
|
||||
DefaultLogger::get()->debug("Generate spatially-sorted vertex cache");
|
||||
|
||||
std::vector<_Type>* p = new std::vector<_Type>(pScene->mNumMeshes);
|
||||
std::vector<_Type>::iterator it = p->begin();
|
||||
|
|
Loading…
Reference in New Issue