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

Fix #126597: GPv3: Support the "insert on back" option in fill tool

Browse Source 
This just swaps the order of old/new curves when combining them in the end.

Pull Request: https://projects.blender.org/blender/blender/pulls/126700
This commit is contained in:
Lukas Tönne
2024-08-23 17:06:05 +02:00
parent 0d4c76c986
commit 948d6a8866
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc
View File

@@ -1224,6 +1224,7 @@ static bool grease_pencil_apply_fill(bContext &C, wmOperator &op, const wmEvent
(brush.gpencil_settings->flag & GP_BRUSH_FILL_HIDE) ?
std::nullopt :
std::make_optional(brush.gpencil_settings->fill_threshold);
const bool on_back = (ts.gpencil_flags & GP_TOOL_FLAG_PAINT_ONBACK);
if (!grease_pencil.has_active_layer()) {
return false;
@@ -1263,8 +1264,9 @@ static bool grease_pencil_apply_fill(bContext &C, wmOperator &op, const wmEvent
Curves *dst_curves_id = curves_new_nomain(std::move(info.target.drawing.strokes_for_write()));
Curves *fill_curves_id = curves_new_nomain(fill_curves);
Array<bke::GeometrySet> geometry_sets = {bke::GeometrySet::from_curves(dst_curves_id),
bke::GeometrySet::from_curves(fill_curves_id)};
Array<bke::GeometrySet> geometry_sets = {
bke::GeometrySet::from_curves(on_back ? fill_curves_id : dst_curves_id),
bke::GeometrySet::from_curves(on_back ? dst_curves_id : fill_curves_id)};
bke::GeometrySet joined_geometry_set = geometry::join_geometries(geometry_sets, {});
bke::CurvesGeometry joined_curves =
(joined_geometry_set.has_curves() ?