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

GPv3: Few changes to invert weight operator

Browse Source 
Cancel operator when active vgroup is locked.
Use new poll function to check if vgroup exists, otherwise grey out the
operator.
And some cleanup.
This addresses the points from !126275

Pull Request: https://projects.blender.org/blender/blender/pulls/126313
This commit is contained in:
Pratik Borhade
2024-08-16 13:18:26 +02:00
committed by Pratik Borhade
parent 7547f1e59a
commit d1f0d71b54
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/editors/grease_pencil/intern/grease_pencil_weight_paint.cc
View File

@@ -13,6 +13,7 @@
#include "BKE_grease_pencil.hh"
#include "BKE_modifier.hh"
#include "BKE_paint.hh"
#include "BKE_report.hh"
#include "DNA_meshdata_types.h"
@@ -357,7 +358,7 @@ static void GREASE_PENCIL_OT_weight_toggle_direction(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
static int grease_pencil_weight_invert_exec(bContext *C, wmOperator * /*op*/)
static int grease_pencil_weight_invert_exec(bContext *C, wmOperator *op)
{
const Scene &scene = *CTX_data_scene(C);
Object *object = CTX_data_active_object(C);
@@ -372,6 +373,11 @@ static int grease_pencil_weight_invert_exec(bContext *C, wmOperator * /*op*/)
const bDeformGroup *active_defgroup = static_cast<const bDeformGroup *>(
BLI_findlink(BKE_object_defgroup_list(object), active_index));
if (active_defgroup->flag & DG_LOCK_WEIGHT) {
BKE_report(op->reports, RPT_WARNING, "Active Vertex Group is locked");
return OPERATOR_CANCELLED;
}
Vector<MutableDrawingInfo> drawings = retrieve_editable_drawings(scene, grease_pencil);
threading::parallel_for_each(drawings, [&](MutableDrawingInfo info) {
@@ -379,17 +385,18 @@ static int grease_pencil_weight_invert_exec(bContext *C, wmOperator * /*op*/)
/* Active vgroup index of drawing. */
const int drawing_vgroup_index = BLI_findstringindex(
&curves.vertex_group_names, active_defgroup->name, offsetof(bDeformGroup, name));
BLI_assert(drawing_vgroup_index != -1);
if (drawing_vgroup_index == -1) {
return;
}
VMutableArray<float> weights = bke::varray_for_mutable_deform_verts(
curves.deform_verts_for_write(), drawing_vgroup_index);
if (weights.size() == 0) {
return;
}
for (const int i : weights.index_range()) {
const float invert_weight = 1 - weights[i];
const float invert_weight = 1.0f - weights[i];
weights.set(i, invert_weight);
}
});
@@ -399,6 +406,16 @@ static int grease_pencil_weight_invert_exec(bContext *C, wmOperator * /*op*/)
return OPERATOR_FINISHED;
}
static bool grease_pencil_vertex_group_weight_poll(bContext *C)
{
const Object *ob = CTX_data_active_object(C);
if (ob == nullptr || BLI_listbase_is_empty(BKE_object_defgroup_list(ob))) {
return false;
}
return grease_pencil_weight_painting_poll(C);
}
static void GREASE_PENCIL_OT_weight_invert(wmOperatorType *ot)
{
/* identifiers */
@@ -408,7 +425,7 @@ static void GREASE_PENCIL_OT_weight_invert(wmOperatorType *ot)
/* api callbacks */
ot->exec = grease_pencil_weight_invert_exec;
ot->poll = grease_pencil_weight_painting_poll;
ot->poll = grease_pencil_vertex_group_weight_poll;
/* flags */
ot->flag = OPTYPE_UNDO | OPTYPE_REGISTER;