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

2019-12-02 20:09:18 +00:00
parent 385070f70f
commit 35668c13fc
15 changed files with 792 additions and 263 deletions
--- a/qglengine/formats/loader_assimp.cpp
+++ b/qglengine/formats/loader_assimp.cpp
@@ -113,7 +113,7 @@ ObjectBase * assimpObject(const aiNode * n, const QVector<Mesh * > & meshes, con
 	} else
 		ret = new ObjectBase();
 	ret->setName(name);
-	ret->setTransform(fromAiMatrix4D(n->mTransformation));
+	ret->setMatrix(fromAiMatrix4D(n->mTransformation));
 	//qDebug() << "add object" << ret << ret->name();
 	if (!light) {
 		for (uint i = 0; i < n->mNumMeshes; ++i) {