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

# Conflicts:
#	src/r_draw.cpp
#	src/r_draw.h
This commit is contained in:
Magnus Norddahl 2016-12-05 08:22:04 +01:00
commit 8a12d040de
18 changed files with 287 additions and 1477 deletions

View file

@ -64,6 +64,7 @@ EXTERN_CVAR(Bool, r_mipmap)
namespace swrenderer
{
using namespace drawerargs;
#define HEIGHTBITS 12
#define HEIGHTSHIFT (FRACBITS-HEIGHTBITS)