From ddbffbec4091a219ac3188d788aab55516af41b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Wed, 11 Dec 2019 21:27:41 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@680
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qglengine/formats/loader_assimp.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/qglengine/formats/loader_assimp.cpp b/qglengine/formats/loader_assimp.cpp
index 38214c4..2974021 100644
--- 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;
 			}
 		}
 	}