Merge branch 'blender-v2.83-release'

2020-04-30 09:55:31 +02:00 · 2020-04-30 09:55:31 +02:00 · 328da12598
parent 02c77e4e5c 2b094be949
commit 328da12598
1 changed files with 4 additions and 0 deletions
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@ -388,6 +388,10 @@ void paint_brush_color_get(struct Scene *scene,
          break;
        }
      }
+      /* Gradient / Colorband colors are not considered PROP_COLOR_GAMMA.
+       * Brush colors are expected to be in sRGB though. */
+      IMB_colormanagement_scene_linear_to_srgb_v3(color_gr);
+
      copy_v3_v3(color, color_gr);
    }
    else {