Adjust to the new structure when loading list of models

* Update Ghoul
This commit is contained in:
Malin Ejdbo
2020-12-22 14:49:07 +01:00
parent fbc8e584d8
commit 8aac7d6400
2 changed files with 6 additions and 1 deletions

View File

@@ -260,7 +260,12 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
combinedGeometry.meshes().push_back(
std::move(geometries[i]->meshes()[m])
);
}
for (unsigned int t = 0; t < geometries[i]->textureStorage().size(); ++t) {
combinedGeometry.textureStorage().push_back(
std::move(geometries[i]->textureStorage()[t])
);
}
}
_geometry = std::make_unique<ghoul::modelgeometry::ModelGeometry>(