diff options
author | Jeroen Bakker <jbakker> | 2020-11-12 11:10:26 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-11-12 11:13:06 +0300 |
commit | c08827e659e5f48034b4f9d4612bd309ea63ff03 (patch) | |
tree | 1cd9b0950b7380d98da6d64b5d7146c71470101d /source/blender/editors/space_image | |
parent | f93081a01b7bf484f51fb7d70ac8a8fd90a59d8c (diff) |
Fix T82093: Sampled Colors Mismatch When Painting (Partial)
When painting in the image editor on data images (Non-color, Raw) the
color mismatched between the sampled color and the actual effect that
the painting has on the image. The root cause is that the sampling is
color managed, but the painting still uses a fixed color management
pipeline with a lot of assumptions. Due to recent changes the drawing
of the image editor is color managed, but the painting isn't what made
these changes show up.
This patch is a work-a-round so that the sampled colors and the effect
the paint has on the texture matches. This isn't the correct solution
as that would be to migrate all the painting tools to use proper color
management.
Reviewed By: Pablo Dobarro
Differential Revision: https://developer.blender.org/D9411
Diffstat (limited to 'source/blender/editors/space_image')
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index e36c7d6b6e7..d95f643d7f9 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -3057,8 +3057,12 @@ void IMAGE_OT_unpack(wmOperatorType *ot) * \{ */ /* Returns color in linear space, matching ED_space_node_color_sample(). */ -bool ED_space_image_color_sample(SpaceImage *sima, ARegion *region, int mval[2], float r_col[3]) +bool ED_space_image_color_sample( + SpaceImage *sima, ARegion *region, int mval[2], float r_col[3], bool *r_is_data) { + if (r_is_data) { + *r_is_data = false; + } if (sima->image == NULL) { return false; } @@ -3096,6 +3100,10 @@ bool ED_space_image_color_sample(SpaceImage *sima, ARegion *region, int mval[2], } } + if (r_is_data) { + *r_is_data = (ibuf->colormanage_flag & IMB_COLORMANAGE_IS_DATA) != 0; + } + ED_space_image_release_buffer(sima, ibuf, lock); return ret; } |