diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-01-13 01:10:46 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-01-13 01:10:46 +0400 |
commit | 1b8eab0fab7b6c4755e10366c43f7f1a7097f661 (patch) | |
tree | fae7481091db5034f532ce546a8720d77a94bdc4 /source/blender/quicktime/apple | |
parent | 4e6fb9f4ab3d79d385b9ae35e88d33356e410d6f (diff) |
Fix related to #29694: quicktime export was not showing or respecting RGBA
option even though some movie formats support alpha.
Diffstat (limited to 'source/blender/quicktime/apple')
-rw-r--r-- | source/blender/quicktime/apple/qtkit_export.m | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m index 365a06c7cd8..045ef973e91 100644 --- a/source/blender/quicktime/apple/qtkit_export.m +++ b/source/blender/quicktime/apple/qtkit_export.m @@ -604,13 +604,14 @@ int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int rect 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 |