blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Fix #118637: crash after editbone duplication in certain case #118676

Merged
Philipp Oeser merged 2 commits from lichtwerk/blender:118637 into blender-v4.1-release 2024-02-26 17:41:05 +01:00
Conversation 0 Commits 2 Files Changed 3 +9 -1
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/animrig/intern/action.cc
View File

@ -87,7 +87,7 @@ FCurve *action_fcurve_ensure(Main *bmain,
agrp = action_groups_add_new(act, group);
/* Sync bone group colors if applicable. */
if (ptr && (ptr->type == &RNA_PoseBone)) {
if (ptr && (ptr->type == &RNA_PoseBone) && ptr->data) {
const bPoseChannel *pchan = static_cast<const bPoseChannel *>(ptr->data);
action_group_colors_set_from_posebone(agrp, pchan);
}

2
source/blender/blenkernel/BKE_action.h
View File

@ -136,6 +136,8 @@ void action_group_colors_set(struct bActionGroup *grp, const struct BoneColor *c
*
* If `pchan->color` is set to a non-default color, that is used. Otherwise the
* armature bone color is used.
*
* Note that if `pchan->bone` is `nullptr`, this function silently does nothing.
*/
void action_group_colors_set_from_posebone(bActionGroup *grp, const bPoseChannel *pchan);

6
source/blender/blenkernel/intern/action.cc
View File

@ -374,6 +374,12 @@ void action_group_colors_sync(bActionGroup *grp, const bActionGroup *ref_grp)
void action_group_colors_set_from_posebone(bActionGroup *grp, const bPoseChannel *pchan)
{
BLI_assert_msg(pchan, "cannot 'set action group colors from posebone' without a posebone");
if (!pchan->bone) {
/* pchan->bone is only set after leaving editmode. */
return;
}
const BoneColor &color = blender::animrig::ANIM_bonecolor_posebone_get(pchan);
action_group_colors_set(grp, &color);
}