blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 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 +6 -6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e3e1c26396 - Show all commits

2
scripts/startup/bl_ui/space_view3d.py
View File

@ -3764,7 +3764,7 @@ class VIEW3D_MT_pose_slide(Menu):
def draw(self, _context):
layout = self.layout
layout.operator("pose.blend_to_rest")
layout.operator("pose.blend_with_rest")
layout.operator("pose.push")
layout.operator("pose.relax")
layout.operator("pose.breakdown")

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

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

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

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

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

@ -1584,11 +1584,11 @@ static int pose_slide_blend_rest_exec(bContext *C, wmOperator *op)
return pose_slide_exec_common(C, op, pso);
}
void POSE_OT_blend_to_rest(wmOperatorType *ot)
void POSE_OT_blend_with_rest(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Blend Pose to Rest Pose";
ot->idname = "POSE_OT_blend_to_rest";
ot->name = "Blend Pose with Rest Pose";
ot->idname = "POSE_OT_blend_with_rest";
ot->description = "Make the current pose more similar to, or further away from, the rest pose";
/* callbacks */