merge with upstream

This commit is contained in:
Nikolay Korolev 2020-03-22 19:47:14 +03:00
commit 861506d048
31 changed files with 4593 additions and 4326 deletions

View file

@ -217,7 +217,7 @@ Idle(void *arg)
RenderEffects();
if((TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_NORMAL) &&
TheCamera.m_ScreenReductionPercentage > 0.0)
TheCamera.m_ScreenReductionPercentage > 0.0f)
TheCamera.SetMotionBlurAlpha(150);
TheCamera.RenderMotionBlur();