Merge branch 'master' into newrenderer2

This commit is contained in:
Christoph Oelckers 2021-04-04 13:10:26 +02:00
commit 55ad51ee1f
29 changed files with 264 additions and 231 deletions

View file

@ -1532,7 +1532,7 @@ int32_t polymost_mddraw(tspriteptr_t tspr)
mdmodel_t *const vm = models[tile2model[Ptile2tile(tspr->picnum,
(tspr->owner >= MAXSPRITES) ? tspr->pal : sprite[tspr->owner].pal)].modelid];
if (vm->mdnum == 1)
return polymost_voxdraw((voxmodel_t *)vm,tspr);
return polymost_voxdraw((voxmodel_t *)vm,tspr, false); // can't access rotating info anymore
else if (vm->mdnum == 3)
return polymost_md3draw((md3model_t *)vm,tspr);
return 0;