# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1278563744 25200
# Node ID 2cd7bb613a830fa5a86d410450bbe7948d05ebdd
# Parent  06c7423f8c609de49ca677fe9489ffd0ff009282
Turn on blending if we're converting from a surface with colorkey enabled

diff -r 06c7423f8c60 -r 2cd7bb613a83 src/video/SDL_surface.c
--- a/src/video/SDL_surface.c	Wed Jul 07 18:58:51 2010 -0700
+++ b/src/video/SDL_surface.c	Wed Jul 07 21:35:44 2010 -0700
@@ -851,7 +851,7 @@
     /* 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)) {