git-svn-id: svn://db.shs.com.ru/libs@680 a8b55f48-bf90-11e4-a774-851b48703e85

2019-12-11 21:27:41 +00:00
parent 9c6e22b3e9
commit ddbffbec40
1 changed files with 6 additions and 2 deletions
--- a/qglengine/formats/loader_assimp.cpp
+++ b/qglengine/formats/loader_assimp.cpp
@@ -116,12 +116,16 @@ ObjectBase * assimpObject(const aiNode * n, const QVector<Mesh * > & meshes, con
 	ret->setMatrix(fromAiMatrix4D(n->mTransformation));
 	//qDebug() << "add object" << ret << ret->name();
 	if (!light) {
+		//qDebug() << name << "has" << n->mNumMeshes << "meshes";
 		for (uint i = 0; i < n->mNumMeshes; ++i) {
 			int mi = n->mMeshes[i];
 			if (meshes[mi]) {
-				ret->setMesh(meshes[mi]);
+				if (!ret->mesh())
+					ret->setMesh(new Mesh());
+				ret->mesh()->append(meshes[mi]);
+				//ret->setMesh(meshes[mi]);
 				//qDebug() << "set mesh" << mi << ret->mesh();
-				break;
+				//break;
 			}
 		}
 	}