Merge branch 'master' into ms-maxvollmer/importer_fixes

pull/3787/head
Kim Kulling 2021-04-28 20:25:10 +02:00 committed by GitHub
commit 9a0b703db1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions

View File

@ -88,7 +88,7 @@ using namespace Assimp::Blender;
using namespace Assimp::Formatter; using namespace Assimp::Formatter;
static const aiImporterDesc blenderDesc = { static const aiImporterDesc blenderDesc = {
"Blender 3D Importer \nhttp://www.blender3d.org", "Blender 3D Importer (http://www.blender3d.org)",
"", "",
"", "",
"No animation support yet", "No animation support yet",

View File

@ -209,9 +209,14 @@ enum aiPostProcessSteps
/** <hr>Removes the node graph and pre-transforms all vertices with /** <hr>Removes the node graph and pre-transforms all vertices with
* the local transformation matrices of their nodes. * the local transformation matrices of their nodes.
* *
* The output scene still contains nodes, however there is only a * If the resulting scene can be reduced to a single mesh, with a single
* root node with children, each one referencing only one mesh, * material, no lights, and no cameras, then the output scene will contain
* and each mesh referencing one material. For rendering, you can * only a root node (with no children) that references the single mesh.
* Otherwise, the output scene will be reduced to a root node with a single
* level of child nodes, each one referencing one mesh, and each mesh
* referencing one material.
*
* In either case, for rendering, you can
* simply render all meshes in order - you don't need to pay * simply render all meshes in order - you don't need to pay
* attention to local transformations and the node hierarchy. * attention to local transformations and the node hierarchy.
* Animations are removed during this step. * Animations are removed during this step.