diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-18 13:51:48 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-18 13:54:59 +0300 |
commit | 95a42ccf1c0fb7dff618bf99a1a6389f597479a5 (patch) | |
tree | 6a2ba16f941ef895d2dbc1bc2be04b681d5478d4 /source/blender/imbuf | |
parent | 8a5effe967052038a0ca0a0eac5cf6d9d056aede (diff) |
Fix T64762: incorrect textures for non-color images with an alpha channel
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/IMB_colormanagement.h | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h index e683d38a0aa..a27945cc369 100644 --- a/source/blender/imbuf/IMB_colormanagement.h +++ b/source/blender/imbuf/IMB_colormanagement.h @@ -61,6 +61,7 @@ const char *IMB_colormanagement_get_rect_colorspace(struct ImBuf *ibuf); bool IMB_colormanagement_space_is_data(struct ColorSpace *colorspace); bool IMB_colormanagement_space_is_scene_linear(struct ColorSpace *colorspace); bool IMB_colormanagement_space_is_srgb(struct ColorSpace *colorspace); +bool IMB_colormanagement_space_name_is_data(const char *name); BLI_INLINE float IMB_colormanagement_get_luminance(const float rgb[3]); BLI_INLINE unsigned char IMB_colormanagement_get_luminance_byte(const unsigned char[3]); diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index b460d268d38..ba0f10446a1 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -1381,6 +1381,12 @@ bool IMB_colormanagement_space_is_srgb(ColorSpace *colorspace) return (colorspace && colorspace->info.is_srgb); } +bool IMB_colormanagement_space_name_is_data(const char *name) +{ + ColorSpace *colorspace = colormanage_colorspace_get_named(name); + return (colorspace && colorspace->is_data); +} + /*********************** Threaded display buffer transform routines *************************/ typedef struct DisplayBufferThread { |