Commit 542bd353 authored by Matthias Möller's avatar Matthias Möller

supports loading files with groups

closes #2179

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free-Staging@18666 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 14796fa6
......@@ -368,7 +368,7 @@ void AssimpPlugin::mapVertices(TriMesh *_triMesh, aiMesh *_mesh) {
}
DataType AssimpPlugin::supportedType() {
DataType type = DATA_POLY_MESH | DATA_TRIANGLE_MESH;
DataType type = DATA_POLY_MESH | DATA_TRIANGLE_MESH | DATA_GROUP;
return type;
}
......@@ -416,7 +416,8 @@ int AssimpPlugin::loadObject(QString _filename) {
}
int AssimpPlugin::loadObject(QString _filename, DataType _type) {
type_ = _type;
if (_type != DATA_GROUP) //if equal => autodetect data
type_ = _type;
return loadObject(_filename);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment