blender
/
blender
137
409
Fork 592
Code Issues 6.3k Pull Requests 771 Projects 19 Wiki Activity

Animation: Merge Push/Relax Rest Pose operators #108309

Merged
Christoph Lendenfeld merged 8 commits from ChrisLend/blender:pose_blend_to_default into main 2023-07-20 09:27:12 +02:00
Conversation 2 Commits 8 Files Changed 4 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 48f3fdf7cc - Show all commits

2
source/blender/editors/armature/armature_intern.h
View File

@ -216,7 +216,7 @@ void POSELIB_OT_blend_pose_asset(struct wmOperatorType *ot);
void POSE_OT_push(struct wmOperatorType *ot); void POSE_OT_push(struct wmOperatorType *ot);
void POSE_OT_relax(struct wmOperatorType *ot); void POSE_OT_relax(struct wmOperatorType *ot);
void POSE_OT_blend_rest(struct wmOperatorType *ot); void POSE_OT_blend_to_rest(struct wmOperatorType *ot);
void POSE_OT_breakdown(struct wmOperatorType *ot); void POSE_OT_breakdown(struct wmOperatorType *ot);
void POSE_OT_blend_to_neighbors(struct wmOperatorType *ot); void POSE_OT_blend_to_neighbors(struct wmOperatorType *ot);

2
source/blender/editors/armature/armature_ops.c
View File

@ -120,7 +120,7 @@ void ED_operatortypes_armature(void)
/* POSE SLIDING */ /* POSE SLIDING */
WM_operatortype_append(POSE_OT_push); WM_operatortype_append(POSE_OT_push);
WM_operatortype_append(POSE_OT_relax); WM_operatortype_append(POSE_OT_relax);
WM_operatortype_append(POSE_OT_blend_rest); WM_operatortype_append(POSE_OT_blend_to_rest);
WM_operatortype_append(POSE_OT_breakdown); WM_operatortype_append(POSE_OT_breakdown);
WM_operatortype_append(POSE_OT_blend_to_neighbors); WM_operatortype_append(POSE_OT_blend_to_neighbors);
} }

2
source/blender/editors/armature/pose_slide.c
View File

@ -1579,7 +1579,7 @@ static int pose_slide_blend_rest_exec(bContext *C, wmOperator *op)
return pose_slide_exec_common(C, op, pso); return pose_slide_exec_common(C, op, pso);
} }
void POSE_OT_blend_rest(wmOperatorType *ot) void POSE_OT_blend_to_rest(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name = "Blend Pose to Rest Pose"; ot->name = "Blend Pose to Rest Pose";