Merge branch 'master' into jgrpp
# Conflicts: # src/blitter/32bpp_optimized.cpp # src/lang/serbian.txt
This commit is contained in:
@@ -373,7 +373,7 @@ void Blitter_40bppAnim::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomL
|
||||
|
||||
if (_screen_disable_anim || VideoDriver::GetInstance()->GetAnimBuffer() == nullptr) {
|
||||
/* This means our output is not to the screen, so we can't be doing any animation stuff, so use our parent Draw() */
|
||||
Blitter_32bppOptimized::Draw(bp, mode, zoom);
|
||||
Blitter_32bppOptimized::Draw<true>(bp, mode, zoom);
|
||||
return;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user