[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43335] trunk/blender/source/blender: Fix related to #29694: quicktime export was not showing or respecting RGBA

[Brecht Van Lommel]

Revision: 43335
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43335
Author:   blendix
Date:     2012-01-12 21:10:46 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
Fix related to #29694: quicktime export was not showing or respecting RGBA
option even though some movie formats support alpha.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c
    trunk/blender/source/blender/quicktime/apple/qtkit_export.m

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2012-01-12 21:10:30 UTC (rev 43334)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2012-01-12 21:10:46 UTC (rev 43335)
@@ -950,6 +950,7 @@
 	case R_IMF_IMTYPE_MULTILAYER:
 	case R_IMF_IMTYPE_DDS:
 	case R_IMF_IMTYPE_JP2:
+	case R_IMF_IMTYPE_QUICKTIME:
 			chan_flag |= IMA_CHAN_FLAG_ALPHA;
 	}
 

Modified: trunk/blender/source/blender/quicktime/apple/qtkit_export.m
===================================================================
--- trunk/blender/source/blender/quicktime/apple/qtkit_export.m	2012-01-12 21:10:30 UTC (rev 43334)
+++ trunk/blender/source/blender/quicktime/apple/qtkit_export.m	2012-01-12 21:10:46 UTC (rev 43335)
@@ -604,13 +604,14 @@
 	OSStatus err = noErr;
 	unsigned char *from_Ptr,*to_Ptr;
 	int y,from_i,to_i;
+	BOOL alpha = (rd->im_format.planes == R_IMF_PLANES_RGBA)? YES: NO;
 	
 	
 	/* Create bitmap image rep in blender format (32bit RGBA) */
 	blBitmapFormatImage = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
 																  pixelsWide:rectx 
 																  pixelsHigh:recty
-															   bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO
+															   bitsPerSample:8 samplesPerPixel:4 hasAlpha:alpha isPlanar:NO
 															  colorSpaceName:NSCalibratedRGBColorSpace 
 																bitmapFormat:NSAlphaNonpremultipliedBitmapFormat
 																 bytesPerRow:rectx*4