Sync with branch 'svn/trunk' r4315
Revisions 4314 and 4315 were reverted: - r4314 introduced several technical issues; keeping it away from the master branch until some improvements will land in SVN. - r4315 touches code related to overlay, which was completely removed when porting to SDL2; this revert makes future merge commit cleaner.
This commit is contained in:
commit
e0e17ac6d9