blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

Animation: Add in Parent space alignment option to the Transform Orientation gizmo #104724

Merged
Nate Rupsis merged 47 commits from nrupsis/blender:parent-space into main 2023-04-20 17:40:31 +02:00
Conversation 21 Commits 47 Files Changed 3 +28 -12
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a0ab449034 - Show all commits

40
source/blender/editors/transform/transform_orientations.c
View File

@ -517,24 +517,40 @@ short ED_transform_calc_orientation_from_type_ex(const Scene *scene,
case V3D_ORIENT_PARENT: {
if (ob) {
if (ob->mode & OB_MODE_POSE) {
printf("I'm in pose mode \n");
bPoseChannel *active_pchan = BKE_pose_channel_active(ob, false);
// switch for parent if it exists
bPoseChannel *space_pchan = active_pchan->parent ? active_pchan->parent : active_pchan;
if (space_pchan) {
// store off the original active bone for a moment, run this, then restore
bArmature *armature = ob->data;
armature->act_bone = space_pchan->bone;
if (active_pchan->parent) {
if (active_pchan->parent->bone->flag & BONE_NO_LOCAL_LOCATION) {
bArmature *armature = ob->data;
armature->act_bone = active_pchan->parent->bone;
ED_getTransformOrientationMatrix(
scene, view_layer, v3d, ob, obedit, pivot_point, r_mat);
armature->act_bone = active_pchan->bone;
ED_getTransformOrientationMatrix(
scene, view_layer, v3d, ob, obedit, pivot_point, r_mat);
armature->act_bone = active_pchan->bone;
}
}
else {
if (active_pchan->bone->flag & BONE_NO_LOCAL_LOCATION) {
unit_m3(r_mat);
}
else {
ED_getTransformOrientationMatrix(
scene, view_layer, v3d, ob, obedit, pivot_point, r_mat);
}
break;
}
}
else {
// handle the parent check at object level
ED_getTransformOrientationMatrix(
scene, view_layer, v3d, ob->parent ? ob->parent : ob, obedit, pivot_point, r_mat);
// TODO if object doesn't have parent, we default to local coordinates
printf("I'm not in pose mode \n");
if (ob->parent) {
ED_getTransformOrientationMatrix(
scene, view_layer, v3d, ob->parent, obedit, pivot_point, r_mat);
}
else {
unit_m3(r_mat);
}
break;
}
}
@ -553,7 +569,7 @@ short ED_transform_calc_orientation_from_type_ex(const Scene *scene,
if (ob) {
if (ob->mode & OB_MODE_POSE) {
/* Each bone moves on its own local axis, but to avoid confusion,
* use the active pones axis for display #33575, this works as expected on a single
* use the active bone'ss axis for display #33575, this works as expected on a single
* bone and users who select many bones will understand what's going on and what local
* means when they start transforming. */
ED_getTransformOrientationMatrix(scene, view_layer, v3d, ob, obedit, pivot_point, r_mat);