diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-10-08 22:35:41 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-10-08 22:35:41 +0400 |
| commit | 4a4f7c802a71a1cdef3a70d23edc6f24ea20905c (patch) | |
| tree | 23609dd74675b1f1525ff4a39475b3d2ea985119 /source/blender/imbuf/intern/cineon/cineon_dpx.c | |
| parent | 9cbb1745c2e149657f9d7a9988eccfc884f0bffc (diff) | |
Bugfix #17784
Playanim now works for:
- tiff, cineon, dpx, hdr, exr
Only multilayer not, that's too much for a bugfix. Multilayer is a totally
different image format, handled separately.
ALso removed redundant printing for dpx/cineon.
And fixed crash in cineon when G.scene doesnt exist. Bad bad, should
not be there!
Diffstat (limited to 'source/blender/imbuf/intern/cineon/cineon_dpx.c')
| -rw-r--r-- | source/blender/imbuf/intern/cineon/cineon_dpx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c index 2959ed654ab..514d6b5522b 100644 --- a/source/blender/imbuf/intern/cineon/cineon_dpx.c +++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c @@ -48,10 +48,10 @@ static void cineon_conversion_parameters(LogImageByteConversionParameters *params) { - params->blackPoint = G.scene->r.cineonblack; - params->whitePoint = G.scene->r.cineonwhite; - params->gamma = G.scene->r.cineongamma; - params->doLogarithm = G.scene->r.subimtype & R_CINEON_LOG; + params->blackPoint = G.scene?G.scene->r.cineonblack:95; + params->whitePoint = G.scene?G.scene->r.cineonwhite:685; + params->gamma = G.scene?G.scene->r.cineongamma:1.7f; + params->doLogarithm = G.scene?G.scene->r.subimtype & R_CINEON_LOG:0; } static struct ImBuf *imb_load_dpx_cineon(unsigned char *mem, int use_cineon, int size, int flags) |