From ee35aee5bb4abf11d0f1d6318209cfd33adb5ffc Mon Sep 17 00:00:00 2001 From: Malin E Date: Mon, 5 Dec 2022 11:20:03 +0100 Subject: [PATCH] Remove PointsAndLines blend mode for models * Duplicate of deafult blend mode --- modules/base/rendering/renderablemodel.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index 31f4da292d..255081f4d9 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -473,7 +473,6 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary) _blendingFuncOption.addOption(DefaultBlending, "Default"); _blendingFuncOption.addOption(AdditiveBlending, "Additive"); - _blendingFuncOption.addOption(PointsAndLinesBlending, "Points and Lines"); _blendingFuncOption.addOption(PolygonBlending, "Polygon"); _blendingFuncOption.addOption(ColorAddingBlending, "Color Adding"); @@ -741,6 +740,7 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) { _program->setUniform(_uniformCache.specularIntensity, _specularIntensity); _program->setUniform(_uniformCache.performShading, _performShading); + // Configure blending glEnablei(GL_BLEND, 0); switch (_blendingFuncOption) { case DefaultBlending: @@ -749,9 +749,6 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) { case AdditiveBlending: glBlendFunc(GL_ONE, GL_ONE); break; - case PointsAndLinesBlending: - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - break; case PolygonBlending: glBlendFunc(GL_SRC_ALPHA_SATURATE, GL_ONE); break;