blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 778 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 +2 -7
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0b0c39a646 - Show all commits

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

@ -592,13 +592,8 @@ static void handle_armature_parent_orientation(const Scene *scene,
// Check if target bone is a child.
if (active_pchan->parent) {
// If Child bone has "Local Location" on, use local location orientation.
if (!(active_pchan->bone->flag & BONE_NO_LOCAL_LOCATION)) {
ED_getTransformOrientationMatrix(scene, view_layer, v3d, ob, obedit, pivot_point, r_mat);
return;
}
// If Child bone doesn't have "Local Location" use parent space.
// For child, show parent local regardless if "local location" is set for parent bone
transform_orientations_create_from_axis(r_mat, UNPACK3(active_pchan->parent->pose_mat));
return;
}

2
source/blender/makesrna/intern/rna_scene.c
View File

@ -642,7 +642,7 @@ const EnumPropertyItem rna_enum_transform_orientation_items[] = {
"Align the transformation axes to the 3D cursor"},
{V3D_ORIENT_PARENT,
"PARENT",
ICON_ORIENTATION_LOCAL,
ICON_BLANK1,
"Parent",
"Align the transformation axes to the object's parent space"},
// {V3D_ORIENT_CUSTOM, "CUSTOM", 0, "Custom", "Use a custom transform orientation"},