diff --git a/ext/ghoul b/ext/ghoul index ab82304571..5259155592 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit ab82304571e5d4f5c4d518385fc523da2b0b805b +Subproject commit 52591555927fdcf476c27069661f2c730401278e diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index f4997a1462..586d8936a8 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -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(