mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-15 10:09:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/jwst-update

Browse Source
This commit is contained in:
Malin E
2022-04-06 13:37:17 +02:00
parent e747af5003 36265bf2c4
commit df46bcfcc1
44 changed files with 130 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/base/rendering/renderablemodel.cpp
View File

@@ -579,7 +579,7 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
if (distanceToCamera < maxDistance) {
_program->activate();
_program->setUniform(_uniformCache.opacity, _opacity);
_program->setUniform(_uniformCache.opacity, opacity());
// Model transform and view transform needs to be in double precision
const glm::dmat4 modelTransform =