Merge remote-tracking branch 'upstream/miami' into miami

This commit is contained in:
Nikolay Korolev 2020-05-06 11:38:02 +03:00
commit 98177f27ba
10 changed files with 279 additions and 84 deletions

View file

@ -3182,14 +3182,12 @@ CCamera::GetScreenFadeStatus(void)
void
CCamera::RenderMotionBlur(void)
{
#ifndef MIAMI // temporary
if(m_BlurType == 0)
return;
CMBlur::MotionBlurRender(m_pRwCamera,
m_BlurRed, m_BlurGreen, m_BlurBlue,
m_motionBlur, m_BlurType, m_imotionBlurAddAlpha);
#endif
m_motionBlur, m_BlurType);
}
void

View file

@ -66,7 +66,7 @@ enum Config {
PATHNODESIZE = 4500,
NUMWEATHERS = 4,
NUMWEATHERS = 7,
NUMHOURS = 24,
NUMEXTRADIRECTIONALS = 4,