From 8881d5f7527ea486a168968affa7240888dad9e5 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Fri, 9 Jul 2010 17:49:29 +0000 Subject: [PATCH] - 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-9d2fd5bffc1f --- code/BlenderDNA.cpp | 2 +- code/ProcessHelper.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/BlenderDNA.cpp b/code/BlenderDNA.cpp index c8bf6fc05..c8c5814e0 100644 --- a/code/BlenderDNA.cpp +++ b/code/BlenderDNA.cpp @@ -292,7 +292,7 @@ DNA::FactoryPair DNA :: GetBlobToStructureConverter( ) const { std::map::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/ diff --git a/code/ProcessHelper.h b/code/ProcessHelper.h index e0cfe0e70..c7e73af70 100644 --- a/code/ProcessHelper.h +++ b/code/ProcessHelper.h @@ -527,7 +527,8 @@ class ComputeSpatialSortProcess : public BaseProcess void Execute( aiScene* pScene) { - typedef std::pair _Type; + typedef std::pair _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();