blender
/
blender
134
398
Fork 579
Code Issues 6.3k Pull Requests 754 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 -2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 113f00a1d3 - Show all commits

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

@ -3750,11 +3750,11 @@ class VIEW3D_MT_pose_slide(Menu):
def draw(self, _context):
layout = self.layout
layout.operator("pose.blend_to_rest")
layout.operator("pose.push")
layout.operator("pose.relax")
layout.operator("pose.breakdown")
layout.operator("pose.blend_to_neighbor")
layout.operator("pose.blend_to_rest")
class VIEW3D_MT_pose_propagate(Menu):

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

@ -1557,6 +1557,10 @@ static int pose_slide_blend_rest_invoke(bContext *C, wmOperator *op, const wmEve
return OPERATOR_CANCELLED;
}
tPoseSlideOp *pso = op->customdata;
ED_slider_factor_set(pso->slider, 0);
ED_slider_factor_bounds_set(pso->slider, -1, 1);
/* do common setup work */
return pose_slide_invoke_common(C, op, event);
}
@ -1585,7 +1589,7 @@ void POSE_OT_blend_to_rest(wmOperatorType *ot)
/* identifiers */
ot->name = "Blend Pose to Rest Pose";
ot->idname = "POSE_OT_blend_to_rest";
ot->description = "Blend the current pose to the rest pose";
ot->description = "Make the current pose more similar to, or further away from, the rest pose";
/* callbacks */
ot->exec = pose_slide_blend_rest_exec;