From c2457e5c41c68b49843efbfc9fe91d7d6649536f Mon Sep 17 00:00:00 2001 From: Malin E Date: Thu, 13 Apr 2023 14:54:49 +0200 Subject: [PATCH] Address PR comments --- modules/base/rendering/renderablemodel.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index db610f75e9..6b2c82319c 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -786,17 +786,11 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) { if (hasOverrideRenderBin()) { // If override render bin is set then use the opacity values as normal - _program->setUniform( - _uniformCache.opacity, - opacity() - ); + _program->setUniform(_uniformCache.opacity, opacity()); } else { - // Otherwise reset - _program->setUniform( - _uniformCache.opacity, - 1.f - ); + // Otherwise reset to 1 + _program->setUniform(_uniformCache.opacity, 1.f); } _geometry->render(*_program); @@ -851,10 +845,7 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) { ); // Make sure opacity in first pass is always 1 - _program->setUniform( - _uniformCache.opacity, - 1.f - ); + _program->setUniform(_uniformCache.opacity, 1.f); // Render Pass 1 // Render all parts of the model into the new framebuffer without opacity