diff --git a/code/LWOLoader.cpp b/code/LWOLoader.cpp index 8150d92d2..77f6d6e34 100644 --- a/code/LWOLoader.cpp +++ b/code/LWOLoader.cpp @@ -973,6 +973,9 @@ void LWOImporter::LoadLWO2VertexMap(unsigned int length, bool perPoly) return; default: + if (name == "APS.Level") { + // XXX handle this (seems to be subdivision-related). + } DefaultLogger::get()->warn("LWO2: Skipping unknown VMAP/VMAD channel \'" + name + "\'"); return; }; diff --git a/doc/AssimpDoc_Html/AssimpDoc.chm b/doc/AssimpDoc_Html/AssimpDoc.chm index 331b7ffa4..e5dc5b636 100644 Binary files a/doc/AssimpDoc_Html/AssimpDoc.chm and b/doc/AssimpDoc_Html/AssimpDoc.chm differ diff --git a/doc/Doxyfile b/doc/Doxyfile index 28b4a3565..831876bd1 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = Assimp -PROJECT_NUMBER = r400 +PROJECT_NUMBER = r590 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff --git a/include/assimp.hpp b/include/assimp.hpp index e8c293cda..19550d199 100644 --- a/include/assimp.hpp +++ b/include/assimp.hpp @@ -490,9 +490,17 @@ public: * will return NULL - until a new scene has been loaded via ReadFile(). * * @return Current scene or NULL if there is currently no scene loaded - * @note --- you know that the aiScene is allocated on Assimp's heap, - * so you need to call Assimp's delete if the heap is not shared? - * And that's why you shouldn't use this method at all. Thanks.*/ + * @note Use this method with maximal caution, and only if you have to. + * By design, aiScene's are exclusively maintained, allocated and + * deallocated by Assimp and no one else. The reasoning behind this + * is the golden rule that deallocations should always be done + * by the module that did the original allocation because heaps + * are not necessarily shared. GetOrphanedScene() enforces you + * to delete the returned scene by yourself, but this will only + * be fine if and only if you're using the same heap as assimp. + * On Windows, it's typically fine when everything is linked + * against the multithreaded-dll version of the runtime library. + * It will work as well for static linkage with Assimp.*/ aiScene* GetOrphanedScene(); // -------------------------------------------------------------------