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

Fix #133762: Grease Pencil does not name new vertex groups as bones

Browse Source 
Was just getting the default name, but if we also have a bone selected
in weightpaint mode, these should be named after the bone (otherwise the
armature modifier does not deform accordingly).

To resolve, basically do the same we do for meshes in
`ED_wpaint_ensure_data`.

Pull Request: https://projects.blender.org/blender/blender/pulls/133804
This commit is contained in:
Philipp Oeser
2025-01-30 14:20:01 +01:00
committed by Philipp Oeser
parent ae8bd075e5
commit 0d37f36ae8
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/editors/sculpt_paint/grease_pencil_weight_paint.hh
View File

@@ -146,8 +146,32 @@ class WeightPaintOperation : public GreasePencilStrokeOperation {
{
int object_defgroup_nr = BKE_object_defgroup_active_index_get(this->object) - 1;
if (object_defgroup_nr == -1) {
BKE_object_defgroup_add(this->object);
object_defgroup_nr = 0;
const ListBase *defbase = BKE_object_defgroup_list(this->object);
if (const Object *modob = BKE_modifiers_is_deformed_by_armature(this->object)) {
/* This happens on a Bone select, when no vgroup existed yet. */
const Bone *actbone = static_cast<bArmature *>(modob->data)->act_bone;
if (actbone) {
const bPoseChannel *pchan = BKE_pose_channel_find_name(modob->pose, actbone->name);
if (pchan) {
bDeformGroup *dg = BKE_object_defgroup_find_name(this->object, pchan->name);
if (dg == nullptr) {
dg = BKE_object_defgroup_add_name(this->object, pchan->name);
object_defgroup_nr = BLI_findindex(defbase, dg);
}
else {
const int actdef = BLI_findindex(defbase, dg);
BLI_assert(actdef >= 0);
this->grease_pencil->vertex_group_active_index = actdef + 1;
object_defgroup_nr = actdef;
}
}
}
}
if (BLI_listbase_is_empty(defbase)) {
BKE_object_defgroup_add(this->object);
object_defgroup_nr = 0;
}
}
this->object_defgroup = static_cast<bDeformGroup *>(
BLI_findlink(BKE_object_defgroup_list(this->object), object_defgroup_nr));