mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-29 07:19:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adjust to the new structure when loading list of models

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
ext/ghoul
+1 -1
Submodule ext/ghoul updated: ab82304571...5259155592
modules/base/rendering/renderablemodel.cpp
+5
View File
@@ -260,7 +260,12 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
combinedGeometry.meshes().push_back( combinedGeometry.meshes().push_back(
std::move(geometries[i]->meshes()[m]) 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>( _geometry = std::make_unique<ghoul::modelgeometry::ModelGeometry>(