Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T92102: Issues with align euler to vector node

Browse Source 
For fixed pivots, make sure the correct pivot axis is being used.
Also add continues or invalid rotations.

Differential Revision: https://developer.blender.org/D12824
This commit is contained in:
Jarrett Johnson
2021-10-11 13:26:31 -05:00
committed by Hans Goudey
parent d993c7b503
commit ca8e8fd8d4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc
View File

@@ -57,6 +57,7 @@ static void align_rotations_auto_pivot(IndexMask mask,
const float3 vector = vectors[i]; const float3 vector = vectors[i];
if (is_zero_v3(vector)) { if (is_zero_v3(vector)) {
output_rotations[i] = input_rotations[i]; output_rotations[i] = input_rotations[i];
continue;
} }
float old_rotation[3][3]; float old_rotation[3][3];
@@ -106,10 +107,12 @@ static void align_rotations_fixed_pivot(IndexMask mask,
if (local_main_axis == local_pivot_axis) { if (local_main_axis == local_pivot_axis) {
/* Can't compute any meaningful rotation angle in this case. */ /* Can't compute any meaningful rotation angle in this case. */
output_rotations[i] = input_rotations[i]; output_rotations[i] = input_rotations[i];
continue;
} }
const float3 vector = vectors[i]; const float3 vector = vectors[i];
if (is_zero_v3(vector)) { if (is_zero_v3(vector)) {
output_rotations[i] = input_rotations[i];
continue; continue;
} }
@@ -182,7 +185,7 @@ class MF_AlignEulerToVector : public fn::MultiFunction {
} }
else { else {
float3 local_pivot_axis = {0.0f, 0.0f, 0.0f}; float3 local_pivot_axis = {0.0f, 0.0f, 0.0f};
local_pivot_axis[main_axis_mode_] = 1; local_pivot_axis[pivot_axis_mode_ - 1] = 1;
align_rotations_fixed_pivot(mask, align_rotations_fixed_pivot(mask,
input_rotations, input_rotations,
vectors, vectors,