blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Fix T79005: Vertex color conversion operators changing the colors 

CD_PROP_COLOR vertex data is stored in scene linear while legacy vertex
colors are srgb, so both operators also need to do this conversion

Reviewed By: sergey

Maniphest Tasks: T79005

Differential Revision: https://developer.blender.org/D8320
This commit is contained in:
Pablo Dobarro 2021-10-18 14:52:06 +02:00 committed by Sergey Sharybin
parent 4de0e2e771
commit 765b1c6b53
Notes: blender-bot 2023-06-26 11:58:59 +02:00 
Referenced by issue #79005, Sculpt vertex colors conversion washed out
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -30,6 +30,7 @@
#include "BLI_gsqueue.h"
#include "BLI_hash.h"
#include "BLI_math.h"
#include "BLI_math_color.h"
#include "BLI_math_color_blend.h"
#include "BLI_task.h"
#include "BLI_utildefines.h"
@ -8684,10 +8685,12 @@ static int vertex_to_loop_colors_exec(bContext *C, wmOperator *UNUSED(op))
for (int j = 0; j < c_poly->totloop; j++) {
int loop_index = c_poly->loopstart + j;
MLoop *c_loop = &loops[c_poly->loopstart + j];
loopcols[loop_index].r = (char)(vertcols[c_loop->v].color[0] * 255);
loopcols[loop_index].g = (char)(vertcols[c_loop->v].color[1] * 255);
loopcols[loop_index].b = (char)(vertcols[c_loop->v].color[2] * 255);
loopcols[loop_index].a = (char)(vertcols[c_loop->v].color[3] * 255);
float srgb_color[4];
linearrgb_to_srgb_v4(srgb_color, vertcols[c_loop->v].color);
loopcols[loop_index].r = (char)(srgb_color[0] * 255);
loopcols[loop_index].g = (char)(srgb_color[1] * 255);
loopcols[loop_index].b = (char)(srgb_color[2] * 255);
loopcols[loop_index].a = (char)(srgb_color[3] * 255);
}
}
@ -8751,6 +8754,7 @@ static int loop_to_vertex_colors_exec(bContext *C, wmOperator *UNUSED(op))
vertcols[c_loop->v].color[1] = (loopcols[loop_index].g / 255.0f);
vertcols[c_loop->v].color[2] = (loopcols[loop_index].b / 255.0f);
vertcols[c_loop->v].color[3] = (loopcols[loop_index].a / 255.0f);
srgb_to_linearrgb_v4(vertcols[c_loop->v].color, vertcols[c_loop->v].color);
}
}