griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPencil: Don'r Replace color if vertex color is empty

Browse Source 
The replace tools only must work over previously vertex painted.
This commit is contained in:
Antonio Vazquez
2020-03-13 21:54:42 +01:00
parent dc99c3532a
commit 7d56c425f8
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/gpencil/gpencil_vertex_paint.c
View File

@@ -484,19 +484,15 @@ static bool brush_replace_apply(tGP_BrushVertexpaintData *gso, bGPDstroke *gps,
/* Apply color to Stroke point. */
if (GPENCIL_TINT_VERTEX_COLOR_STROKE(brush)) {
copy_v3_v3(pt->vert_color, gso->linear_color);
/* If not mix color, full replace. */
if (pt->vert_color[3] == 0.0f) {
pt->vert_color[3] = 1.0f;
if (pt->vert_color[3] > 0.0f) {
copy_v3_v3(pt->vert_color, gso->linear_color);
}
}
/* Apply color to Fill area (all with same color and factor). */
if (GPENCIL_TINT_VERTEX_COLOR_FILL(brush)) {
copy_v3_v3(gps->vert_color_fill, gso->linear_color);
/* If not mix color, full replace. */
if (gps->vert_color_fill[3] == 0.0f) {
gps->vert_color_fill[3] = 1.0f;
if (gps->vert_color_fill[3] > 0.0f) {
copy_v3_v3(gps->vert_color_fill, gso->linear_color);
}
}