diff options
Diffstat (limited to 'source/blender/editors/armature/pose_group.c')
| -rw-r--r-- | source/blender/editors/armature/pose_group.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/source/blender/editors/armature/pose_group.c b/source/blender/editors/armature/pose_group.c index 9648bb99c05..aefca13d66c 100644 --- a/source/blender/editors/armature/pose_group.c +++ b/source/blender/editors/armature/pose_group.c @@ -38,9 +38,12 @@ #include "DNA_armature_types.h" #include "DNA_object_types.h" +#include "BKE_armature.h" #include "BKE_action.h" #include "BKE_context.h" +#include "DEG_depsgraph.h" + #include "RNA_access.h" #include "RNA_define.h" @@ -104,6 +107,7 @@ static int pose_group_remove_exec(bContext *C, wmOperator *UNUSED(op)) /* notifiers for updates */ WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); + DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE); return OPERATOR_FINISHED; } @@ -204,15 +208,16 @@ static int pose_group_assign_exec(bContext *C, wmOperator *op) BKE_pose_add_group(ob->pose, NULL); /* add selected bones to group then */ - CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones) + FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN (ob, pchan) { pchan->agrp_index = pose->active_group; done = true; } - CTX_DATA_END; + FOREACH_PCHAN_SELECTED_IN_OBJECT_END; /* notifiers for updates */ WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); + DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE); /* report done status */ if (done) @@ -251,17 +256,18 @@ static int pose_group_unassign_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_CANCELLED; /* find selected bones to remove from all bone groups */ - CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones) + FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN (ob, pchan) { if (pchan->agrp_index) { pchan->agrp_index = 0; done = true; } } - CTX_DATA_END; + FOREACH_PCHAN_SELECTED_IN_OBJECT_END; /* notifiers for updates */ WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); + DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE); /* report done status */ if (done) @@ -413,6 +419,7 @@ static int group_sort_exec(bContext *C, wmOperator *UNUSED(op)) /* notifiers for updates */ WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); + DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE); return OPERATOR_FINISHED; } @@ -432,11 +439,11 @@ void POSE_OT_group_sort(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -static void pose_group_select(bContext *C, Object *ob, bool select) +static void pose_group_select(Object *ob, bool select) { bPose *pose = ob->pose; - CTX_DATA_BEGIN (C, bPoseChannel *, pchan, visible_pose_bones) + FOREACH_PCHAN_VISIBLE_IN_OBJECT_BEGIN (ob, pchan) { if ((pchan->bone->flag & BONE_UNSELECTABLE) == 0) { if (select) { @@ -449,7 +456,7 @@ static void pose_group_select(bContext *C, Object *ob, bool select) } } } - CTX_DATA_END; + FOREACH_PCHAN_VISIBLE_IN_OBJECT_END; } static int pose_group_select_exec(bContext *C, wmOperator *UNUSED(op)) @@ -460,7 +467,7 @@ static int pose_group_select_exec(bContext *C, wmOperator *UNUSED(op)) if (ELEM(NULL, ob, ob->pose)) return OPERATOR_CANCELLED; - pose_group_select(C, ob, 1); + pose_group_select(ob, 1); /* notifiers for updates */ WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); @@ -491,7 +498,7 @@ static int pose_group_deselect_exec(bContext *C, wmOperator *UNUSED(op)) if (ELEM(NULL, ob, ob->pose)) return OPERATOR_CANCELLED; - pose_group_select(C, ob, 0); + pose_group_select(ob, 0); /* notifiers for updates */ WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); |