From f54189a97f6d80181deb4f6d952ccf10f0e59ccf Mon Sep 17 00:00:00 2001 From: jacob1 Date: Tue, 9 May 2017 22:43:53 -0400 Subject: [PATCH] fix PHOT/PLSM not following the correct heat scale, fixes #336 Still many issues if you manually add on other effects to heat mode, but at least now the default graphics are fine --- src/graphics/Renderer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp index d528e58d61..01d9aac0de 100644 --- a/src/graphics/Renderer.cpp +++ b/src/graphics/Renderer.cpp @@ -1367,6 +1367,8 @@ void Renderer::render_parts() cola = 255; if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR; + else if ((pixel_mode & (PMODE_BLEND | PMODE_ADD)) == (PMODE_BLEND | PMODE_ADD)) + pixel_mode = (pixel_mode & ~(PMODE_BLEND|PMODE_ADD)) | PMODE_FLAT; else if (!pixel_mode) pixel_mode |= PMODE_FLAT; } @@ -1381,6 +1383,8 @@ void Renderer::render_parts() cola = 255; if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR; + else if ((pixel_mode & (PMODE_BLEND | PMODE_ADD)) == (PMODE_BLEND | PMODE_ADD)) + pixel_mode = (pixel_mode & ~(PMODE_BLEND|PMODE_ADD)) | PMODE_FLAT; else if (!pixel_mode) pixel_mode |= PMODE_FLAT; }