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 +4 -2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2492bb62bd - Show all commits

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

@ -524,7 +524,9 @@ short ED_transform_calc_orientation_from_type_ex(const Scene *scene,
// store off the original active bone for a moment, run this, then restore
bArmature *armature = ob->data;
armature->act_bone = space_pchan->bone;
ED_getTransformOrientationMatrix(view_layer, v3d, ob, obedit, pivot_point, r_mat);
ED_getTransformOrientationMatrix(
scene, view_layer, v3d, ob, obedit, pivot_point, r_mat);
armature->act_bone = active_pchan->bone;
break;
}
@ -532,7 +534,7 @@ short ED_transform_calc_orientation_from_type_ex(const Scene *scene,
else {
// handle the parent check at object level
ED_getTransformOrientationMatrix(
view_layer, v3d, ob->parent ? ob->parent : ob, obedit, pivot_point, r_mat);
scene, view_layer, v3d, ob->parent ? ob->parent : ob, obedit, pivot_point, r_mat);
break;
}
}