ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-28 12:24:36 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #134793: Grease Pencil: Set Uniform Opacity cannot set fill opacities

Browse source 
Fill opacities of individual strokes was overlooked when implementing
the Set Uniform Opacity operator, now corrected and also added a
separate property for controlling stroke/fills opacity.

Pull Request: https://projects.blender.org/blender/blender/pulls/134982
This commit is contained in:
YimingWu 2025-02-24 18:15:32 +01:00 • committed by Falk David
parent c6d2a6f856
commit 9759a9df5e
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
View file

@ -1123,11 +1123,14 @@ static void GREASE_PENCIL_OT_set_uniform_thickness(wmOperatorType *ot)
static int grease_pencil_set_uniform_opacity_exec(bContext *C, wmOperator *op)
{
using namespace blender::bke;
const Scene *scene = CTX_data_scene(C);
Object *object = CTX_data_active_object(C);
GreasePencil &grease_pencil = *static_cast<GreasePencil *>(object->data);
const float opacity = RNA_float_get(op->ptr, "opacity");
const float opacity_stroke = RNA_float_get(op->ptr, "opacity_stroke");
const float opacity_fill = RNA_float_get(op->ptr, "opacity_fill");
bool changed = false;
const Vector<MutableDrawingInfo> drawings = retrieve_editable_drawings(*scene, grease_pencil);
@ -1138,11 +1141,21 @@ static int grease_pencil_set_uniform_opacity_exec(bContext *C, wmOperator *op)
if (strokes.is_empty()) {
return;
}
bke::CurvesGeometry &curves = info.drawing.strokes_for_write();
CurvesGeometry &curves = info.drawing.strokes_for_write();
MutableAttributeAccessor attributes = curves.attributes_for_write();
const OffsetIndices<int> points_by_curve = curves.points_by_curve();
MutableSpan<float> opacities = info.drawing.opacities_for_write();
bke::curves::fill_points<float>(points_by_curve, strokes, opacity, opacities);
bke::curves::fill_points<float>(points_by_curve, strokes, opacity_stroke, opacities);
if (SpanAttributeWriter<float> fill_opacities = attributes.lookup_or_add_for_write_span<float>(
"fill_opacity", AttrDomain::Curve))
{
strokes.foreach_index(GrainSize(2048), [&](const int64_t curve) {
fill_opacities.span[curve] = opacity_fill;
});
}
changed = true;
});
@ -1165,7 +1178,10 @@ static void GREASE_PENCIL_OT_set_uniform_opacity(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
ot->prop = RNA_def_float(ot->srna, "opacity", 1.0f, 0.0f, 1.0f, "Opacity", "", 0.0f, 1.0f);
/* Differentiate default opacities for stroke & fills so shapes with same stroke+fill colors will
* be more readable. */
RNA_def_float(ot->srna, "opacity_stroke", 1.0f, 0.0f, 1.0f, "Stroke Opacity", "", 0.0f, 1.0f);
RNA_def_float(ot->srna, "opacity_fill", 0.5f, 0.0f, 1.0f, "Fill Opacity", "", 0.0f, 1.0f);
}
/** \} */