Merge branch 'master' into feature/model-opacity

2026-01-06 19:50:03 -06:00 · 2022-11-02 13:51:22 +01:00
parent 3cca0fb229 ed83169c29
commit 2fe78e949d
148 changed files with 1428 additions and 867 deletions
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -83,7 +83,7 @@ ScreenSpaceFramebuffer::ScreenSpaceFramebuffer(const ghoul::Dictionary& dictiona
    _size.set(glm::vec4(0.f, 0.f, resolution.x, resolution.y));
 }

-ScreenSpaceFramebuffer::~ScreenSpaceFramebuffer() {} // NOLINT
+ScreenSpaceFramebuffer::~ScreenSpaceFramebuffer() {}

 bool ScreenSpaceFramebuffer::initializeGL() {
    ScreenSpaceRenderable::initializeGL();