Turn on blending if we're converting from a surface with colorkey ena…

…bled
libsdl-org · Jul 8, 2010 · 13a96d8aab9b89c53b903e20aacbc25885582c9f · 13a96d8
1 parent e6a0cd1
commit 13a96d8aab9b89c53b903e20aacbc25885582c9f
Unified Split

Showing with 1 addition and 1 deletion.

+1 −1 src/video/SDL_surface.c
diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c
@@ -851,7 +851,7 @@ SDL_ConvertSurface(SDL_Surface * surface, SDL_PixelFormat * format,
     /* Enable alpha blending by default if the new surface has an
      * alpha channel or alpha modulation */
     if ((surface->format->Amask && format->Amask) ||
-        (copy_flags & SDL_COPY_MODULATE_ALPHA)) {
+        (copy_flags & (SDL_COPY_COLORKEY|SDL_COPY_MODULATE_ALPHA))) {
         SDL_SetSurfaceBlendMode(convert, SDL_BLENDMODE_BLEND);
     }
     if ((copy_flags & SDL_COPY_RLE_DESIRED) || (flags & SDL_RLEACCEL)) {