matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug where deco renders on EMBR in save thumbnails

Browse Source
This commit is contained in:
jacob1 2020-02-09 14:10:27 -05:00
parent 051d70e6e2
commit ffea880da1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/simulation/elements/EMBR.cpp
View File

@ -94,7 +94,15 @@ static int graphics(GRAPHICS_FUNC_ARGS)
*colr = *colg = *colb = 255; *colr = *colg = *colb = 255;
} }
if (ren->decorations_enable && cpart->dcolour) bool deco = false;
if (ren->decorations_enable && cpart->dcolour && (cpart->dcolour&0xFF000000))
{
if (!ren->blackDecorations) // if blackDecorations is off, always show deco
deco = true;
else if (((cpart->dcolour>>24)&0xFF) >= 250 && ((cpart->dcolour>>16)&0xFF) <= 5 && ((cpart->dcolour>>8)&0xFF) <= 5 && ((cpart->dcolour)&0xFF) <= 5) // else only render black deco
deco = true;
}
if (deco)
{ {
int a = (cpart->dcolour>>24)&0xFF; int a = (cpart->dcolour>>24)&0xFF;
*colr = (a*((cpart->dcolour>>16)&0xFF) + (255-a)**colr) >> 8; *colr = (a*((cpart->dcolour>>16)&0xFF) + (255-a)**colr) >> 8;