blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 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 +11 -3
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cc12f1461d - Show all commits

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

@ -590,18 +590,25 @@ static void handle_armature_parent_orientation(const Scene *scene,
{
Sybren A. Stüvel commented 2023-04-20 10:28:34 +02:00
Outdated
Review
Copy Link

Some style remarks:

  • Even for C++ the C-style of comments is preferred (ref)
  • End comments with a period.

And this one is more of a personal preference, but I'd remove the newline between the if and its body, as they form one 'unit' within the function. No strong feelings either way, so do with this one as you wish.

Some style remarks: - Even for C++ the C-style of comments is preferred ([ref](https://wiki.blender.org/wiki/Style_Guide/C_Cpp#C.2FC.2B.2B_Comments)) - End comments with a period. And this one is more of a personal preference, but I'd remove the newline between the `if` and its body, as they form one 'unit' within the function. No strong feelings either way, so do with this one as you wish.
bPoseChannel *active_pchan = BKE_pose_channel_active(ob, false);
// 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 (active_pchan->parent) {
// For child, show parent local regardless if "local location" is set for parent bone.
// If Child bone doesn't have "Local Location" use parent space.
transform_orientations_create_from_axis(r_mat, UNPACK3(active_pchan->parent->pose_mat));
return;
}
// if root, and "Local Location" isn't set, use local transform of armature object.
// If root, and "Local Location" isn't set, use local transform of armature object.
if (active_pchan->bone->flag & BONE_NO_LOCAL_LOCATION) {
transform_orientations_create_from_axis(r_mat, UNPACK3(ob->object_to_world));
return;
}
// if root or child bone has "Local Location" set, use bone local.
// If root has "Local Location" set, use bone local.
ED_getTransformOrientationMatrix(scene, view_layer, v3d, ob, obedit, pivot_point, r_mat);
return;
}
@ -611,6 +618,7 @@ static void handle_object_parent_orientation(Object *ob, float r_mat[3][3])
// If object has parent, then orient to parent.
if (ob->parent) {
transform_orientations_create_from_axis(r_mat, UNPACK3(ob->parent->object_to_world));
7
}
else {
// If object doesn't have parent, then orient to world.