Merge branch 'master' into jgrpp

2021-04-05 17:50:39 +01:00
parent 297b340697 9bfa7198fd
commit 5e14b54a0c
164 changed files with 3493 additions and 2443 deletions
--- a/src/blitter/32bpp_optimized.cpp
+++ b/src/blitter/32bpp_optimized.cpp
@@ -373,6 +373,10 @@ template <bool Tpal_to_rgb> Sprite *Blitter_32bppOptimized::EncodeInternal(const
 							dst_px->r = colour.r;
 							dst_px->g = colour.g;
 							dst_px->b = colour.b;
+						} else {
+							dst_px->r = src->r;
+							dst_px->g = src->g;
+							dst_px->b = src->b;
 						}
 					} else {
 						dst_px->r = src->r;