diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2020-03-23 15:51:55 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-03-23 15:56:42 +0300 |
| commit | 6a5bd812b569d5fe1f09bd5610ce9d0c119f1a21 (patch) | |
| tree | 92c1b1038044aa53843a459623b5f2f8eba76da8 /source/blender/editors/include/ED_image.h | |
| parent | 64982e213f014123d1b0406cf9ae893910a6a3d3 (diff) | |
Fix T74586: Image Editor Uses Invalid Display Channels
When using the image editor the display channels attribute can become
invalid when selecting another image/buffer. This patch will check what
display channels are valid and when an invalid channel is selected it
will fall back to the color channel.
To de-duplicate the code it also introduces a
`ED_space_image_get_display_channel_mask` function that will determine
the valid bitflags for the display channel of a given `ImBuf`.
Diffstat (limited to 'source/blender/editors/include/ED_image.h')
| -rw-r--r-- | source/blender/editors/include/ED_image.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index 0e820a1c2d6..1c260bb826a 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -61,6 +61,7 @@ bool ED_space_image_color_sample(struct SpaceImage *sima, int mval[2], float r_col[3]); struct ImBuf *ED_space_image_acquire_buffer(struct SpaceImage *sima, void **r_lock, int tile); +int ED_space_image_get_display_channel_mask(struct ImBuf *ibuf); void ED_space_image_release_buffer(struct SpaceImage *sima, struct ImBuf *ibuf, void *lock); bool ED_space_image_has_buffer(struct SpaceImage *sima); |