mirrors/blender
1
0
Fork 0
mirror of https://projects.blender.org/blender/blender.git synced 2025-01-22 15:32:15 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix #133240: Grease Pencil: Reset vertex color ignores selection mask

Browse source 
`Reset color attribute` operator currently removes the `vertex_color`
attribute from geometry. If selection exists, reset the color value to
1.0 instead of clearing the entire attribute.

Pull Request: https://projects.blender.org/blender/blender/pulls/133249
This commit is contained in:
Pratik Borhade 2025-01-20 12:58:34 +01:00 committed by Falk David
parent 131270cb5a
commit ff9992d77f
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/blender/editors/grease_pencil/intern/grease_pencil_vertex_paint.cc
View file

@ -431,6 +431,8 @@ static int grease_pencil_vertex_paint_reset_exec(bContext *C, wmOperator *op)
Object &object = *CTX_data_active_object(C);
GreasePencil &grease_pencil = *static_cast<GreasePencil *>(object.data);
const VertexColorMode mode = VertexColorMode(RNA_enum_get(op->ptr, "mode"));
const bool use_selection_mask = GPENCIL_ANY_VERTEX_MASK(
eGP_vertex_SelectMaskFlag(scene.toolsettings->gpencil_selectmode_vertex));
std::atomic<bool> any_changed;
Vector<MutableDrawingInfo> drawings = retrieve_editable_drawings(scene, grease_pencil);
@ -439,8 +441,22 @@ static int grease_pencil_vertex_paint_reset_exec(bContext *C, wmOperator *op)
if (curves.is_empty()) {
return;
}
/* Remove the color attributes. */
bool changed = false;
if (use_selection_mask) {
changed |= apply_color_operation_for_mode(
mode,
object,
info,
use_selection_mask,
[&](const ColorGeometry4f &color) -> ColorGeometry4f {
return ColorGeometry4f(1.0, 1.0, 1.0, 1.0);
});
any_changed.store(any_changed | changed, std::memory_order_relaxed);
return;
}
/* Remove the color attributes. */
if (ELEM(mode, VertexColorMode::Stroke, VertexColorMode::Both)) {
changed |= curves.attributes_for_write().remove("vertex_color");
}