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

GPv3: Primitive use hardness setting.

Browse Source 
This makes the all of the primitive tools uses hardness.

Note: there is no UI to change the hardness while using the tool, this matches GPv2.

Pull Request: https://projects.blender.org/blender/blender/pulls/123519
This commit is contained in:
casey bianco-davis
2024-06-21 12:12:27 +02:00
committed by Falk David
parent c9ff4a9e0d
commit ddafc57633
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/grease_pencil/intern/grease_pencil_primitive.cc
View File

@@ -124,7 +124,7 @@ struct PrimitiveToolOperation {
BrushGpencilSettings *settings;
float4 vertex_color;
int material_index;
float hardness;
float softness;
Brush *brush;
OperatorMode mode;
@@ -507,7 +507,7 @@ static void grease_pencil_primitive_init_curves(PrimitiveToolOperation &ptd)
const bool is_cyclic = ELEM(ptd.type, PrimitiveType::Box, PrimitiveType::Circle);
cyclic.span.last() = is_cyclic;
materials.span.last() = ptd.material_index;
softness.span.last() = 1.0f - ptd.hardness;
softness.span.last() = ptd.softness;
cyclic.finish();
materials.finish();
@@ -714,8 +714,7 @@ static int grease_pencil_primitive_invoke(bContext *C, wmOperator *op, const wmE
float4(0.0f);
srgb_to_linearrgb_v4(ptd.vertex_color, ptd.vertex_color);
/* TODO: Add UI for hardness. */
ptd.hardness = 1.0f;
ptd.softness = 1.0 - ptd.settings->hardness;
BLI_assert(grease_pencil->has_active_layer());
ptd.drawing = grease_pencil->get_editable_drawing_at(*grease_pencil->get_active_layer(),