OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master' into qzdoom

Browse source 
# Conflicts:
#	src/swrenderer/scene/r_things.cpp
This commit is contained in:
Magnus Norddahl 2017-01-07 17:44:15 +01:00
commit bf850bb788
10 changed files with 74 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/swrenderer/things/r_particle.cpp
View file

@ -193,7 +193,7 @@ namespace swrenderer
vis->startfrac = 255 & (particle->color >> 24);
vis->pic = NULL;
vis->bIsVoxel = false;
vis->renderflags = particle->trans;
vis->renderflags = (short)(particle->alpha * 255.0f + 0.5f);
vis->FakeFlatStat = fakeside;
vis->floorclip = 0;
vis->Style.ColormapNum = 0;