blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Fix #104554: 2d paint does not paint with linear color on 32bit images #112631

Open
Philipp Oeser wants to merge 2 commits from lichtwerk/blender:104554 into main
pull from: lichtwerk/blender:104554
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 4 Commits 2 Files Changed 1 +12 -4
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d52c9208f4 - Show all commits

16
source/blender/editors/sculpt_paint/paint_image_2d.cc
View File

@ -390,8 +390,12 @@ static ImBuf *brush_painter_imbuf_new(
if (brush->imagepaint_tool == PAINT_TOOL_DRAW) {
paint_brush_color_get(
scene, brush, use_color_correction, cache->invert, distance, pressure, brush_rgb, display);
if (use_float) {
srgb_to_linearrgb_v3_v3(brush_rgb, brush_rgb);
/* Non-Color colorspace for float images would result in untouched sRGB (use_color_correction
* is false in that case) brush colors, need to be linear though. */
if (use_float && !use_color_correction) {
if (tile->canvas->colormanage_flag & IMB_COLORMANAGE_IS_DATA) {
srgb_to_linearrgb_v3_v3(brush_rgb, brush_rgb);
}
}
}
else {
@ -477,8 +481,12 @@ static void brush_painter_imbuf_update(BrushPainter *painter,
if (brush->imagepaint_tool == PAINT_TOOL_DRAW) {
paint_brush_color_get(
scene, brush, use_color_correction, cache->invert, 0.0f, 1.0f, brush_rgb, display);
if (use_float) {
srgb_to_linearrgb_v3_v3(brush_rgb, brush_rgb);
/* Non-Color colorspace for float images would result in untouched sRGB (use_color_correction
* is false in that case) brush colors, need to be linear though. */
if (use_float && !use_color_correction) {
if (tile->canvas->colormanage_flag & IMB_COLORMANAGE_IS_DATA) {
srgb_to_linearrgb_v3_v3(brush_rgb, brush_rgb);
}
}
}
else {