Animation: Merge Push/Relax Rest Pose operators #108309

Christoph Lendenfeld · 2023-05-26T12:51:37+02:00

2023-05-26 12:51:37 +02:00

This patch merges the two operators Push Pose from Rest Pose and Relax Pose from Rest Pose into one new operator Blend Pose with Rest Pose

The operator has a default range of -1/1 with a default of 0.
The functionality of Relax Pose from Rest Pose is on the positive axis and Push Pose from Rest Pose on the negative.
This is a breaking change so ideal for 4.0

This patch merges the two operators `Push Pose from Rest Pose` and `Relax Pose from Rest Pose` into one new operator `Blend Pose with Rest Pose` The operator has a default range of -1/1 with a default of 0. The functionality of `Relax Pose from Rest Pose` is on the positive axis and `Push Pose from Rest Pose` on the negative. This is a breaking change so ideal for 4.0

Christoph Lendenfeld added this to the 4.0 milestone 2023-05-26 12:51:37 +02:00

Christoph Lendenfeld added the

Module

Animation & Rigging

label 2023-05-26 12:51:37 +02:00

Christoph Lendenfeld added 1 commit 2023-05-26 12:51:43 +02:00

53fffb5e56 merge operators into 1

Christoph Lendenfeld added 1 commit 2023-05-26 12:53:04 +02:00

48f3fdf7cc rename operator "blend_TO_rest"

to make consistent with blend_to_default

Christoph Lendenfeld requested review from Sybren A. Stüvel 2023-05-26 12:55:51 +02:00

Sybren A. Stüvel requested changes 2023-05-26 14:57:17 +02:00

Sybren A. Stüvel left a comment

Good idea to merge these two, as they're two sides of the same coin. A few remarks:

The initial value is now at 50%, causing an immediate jump in the pose. I think 0% would be a better start, so that you can gradually dial in the desired amount.
IMO it would be better to have the 'negative' range (i.e. "push from rest pose") available immediately, without having to use the E key. Even though it's technically extrapolation, it also makes the feature less accessible.

From the change in naming, the extra key required to get the 'push from' behaviour, the change in name and description, those all appear to be hiding the 'push from' side of things. These used to be two equal operators (in terms of visibility, directness, etc.), and I think it's good to rethink some of the details to make sure that it doesn't appear like one of them got lost somehow.

Good idea to merge these two, as they're two sides of the same coin. A few remarks: - The initial value is now at 50%, causing an immediate jump in the pose. I think 0% would be a better start, so that you can gradually dial in the desired amount. - IMO it would be better to have the 'negative' range (i.e. "push from rest pose") available immediately, without having to use the `E` key. Even though it's technically extrapolation, it also makes the feature less accessible. From the change in naming, the extra key required to get the 'push from' behaviour, the change in name and description, those all appear to be hiding the 'push from' side of things. These used to be two equal operators (in terms of visibility, directness, etc.), and I think it's good to rethink some of the details to make sure that it doesn't appear like one of them got lost somehow.

scripts/startup/bl_ui/space_view3d.py Outdated

													
				@ -3739,3 +3737,4 @@

				        layout.operator("pose.relax")

				        layout.operator("pose.breakdown")

				        layout.operator("pose.blend_to_neighbor")

				        layout.operator("pose.blend_to_rest")

Sybren A. Stüvel commented

2023-05-26 14:47:11 +02:00

For findability it might be better to keep the position in the menu the same.

source/blender/editors/armature/pose_slide.c Outdated

													
				@ -1658,1 +1585,3 @@

				  ot->description = "Make the current pose more similar to the rest pose";

				  ot->name = "Blend Pose to Rest Pose";

				  ot->idname = "POSE_OT_blend_to_rest";

				  ot->description = "Blend the current pose to the rest pose";

Sybren A. Stüvel commented

2023-05-26 14:53:04 +02:00

I think the old description was better. As the wording is more different from the operator name, it is more explanatory for when you don't quite understand the operator name itself.

Also the current description only describes one half of the operator. How about something like this?

"Make the current pose more similar to, or further away from, the rest pose"

Same for the name, by the way. Maybe change it to "Blend Pose from/to Rest Pose"?

I think the old description was better. As the wording is more different from the operator name, it is more explanatory for when you don't quite understand the operator name itself. Also the current description only describes one half of the operator. How about something like this? "Make the current pose more similar to, or further away from, the rest pose" Same for the name, by the way. Maybe change it to "Blend Pose from/to Rest Pose"?

Christoph Lendenfeld added 2 commits 2023-06-01 12:05:32 +02:00

6c7f4d195a Merge branch 'main' into pose_blend_to_default

113f00a1d3 implement sybrens comments

Christoph Lendenfeld commented

2023-06-01 12:10:28 +02:00

I've implemented the changes, except for the change to the operator name
This needs to be discussed in the meeting, but the name "Blend Pose from Rest Pose" is confusing to me.
Like it's not clear where it is going.

That's also the reason why I hid away the push functionality behind the overshoot at first. As an animator it is hard to predict where that is going, so it will always be less important than blending to the rest pose. But I see from a consistency point of view how it should stay the same.

I've implemented the changes, except for the change to the operator name This needs to be discussed in the meeting, but the name "Blend Pose from Rest Pose" is confusing to me. Like it's not clear where it is going. That's also the reason why I hid away the push functionality behind the overshoot at first. As an animator it is hard to predict where that is going, so it will always be less important than blending to the rest pose. But I see from a consistency point of view how it should stay the same.

Christoph Lendenfeld requested review from Sybren A. Stüvel 2023-06-01 12:10:43 +02:00

~~Christoph Lendenfeld referenced this pull request 2023-06-09 16:25:40 +02:00~~

Breaking changes for 4.0 #105523

Christoph Lendenfeld added 2 commits 2023-06-09 18:48:30 +02:00

b3da078ff7 Merge branch 'main' into pose_blend_to_default

e3e1c26396 rename to blend with rest pose

Christoph Lendenfeld commented

2023-06-09 18:48:58 +02:00

renamed operator to Blend Pose with Rest Pose as discussed yesterday in the A&R meeting

renamed operator to `Blend Pose with Rest Pose` as discussed yesterday in the A&R meeting

Christoph Lendenfeld added this to the Animation & Rigging project 2023-07-14 16:45:30 +02:00

Sybren A. Stüvel approved these changes 2023-07-17 18:12:35 +02:00

Sybren A. Stüvel left a comment

LGTM!

As a follow-up refactor, do you think it's worth it to change

if (!ELEM(pso->mode, POSESLIDE_BLEND_REST)) {
  pose_slide_apply(C, pso);
}
else {
  pose_slide_rest_pose_apply(C, pso);
}

to

if (pso->mode == POSESLIDE_BLEND_REST) {
  pose_slide_rest_pose_apply(C, pso);
}
else {
  pose_slide_apply(C, pso);
}

?

LGTM! As a follow-up refactor, do you think it's worth it to change ```c if (!ELEM(pso->mode, POSESLIDE_BLEND_REST)) { pose_slide_apply(C, pso); } else { pose_slide_rest_pose_apply(C, pso); } ``` to ```c if (pso->mode == POSESLIDE_BLEND_REST) { pose_slide_rest_pose_apply(C, pso); } else { pose_slide_apply(C, pso); } ``` ?

Christoph Lendenfeld added 2 commits 2023-07-20 09:26:10 +02:00

6877088d92 Merge branch 'main' into pose_blend_to_default

36ad5f5e12 fix merge issues

Christoph Lendenfeld merged commit 44fb4fa46a into main

2023-07-20 09:27:12 +02:00

Christoph Lendenfeld referenced this issue from a commit

2023-07-20 09:27:13 +02:00

Animation: Merge Push/Relax Rest Pose operators

Christoph Lendenfeld deleted branch pose_blend_to_default

2023-07-20 09:27:14 +02:00

William Leeson referenced this issue from a commit

2023-07-21 10:01:54 +02:00