diff options
author | Sebastian Parborg <darkdefende@gmail.com> | 2021-01-20 20:18:38 +0300 |
---|---|---|
committer | Sebastian Parborg <darkdefende@gmail.com> | 2021-01-20 20:18:38 +0300 |
commit | c07c110467ca3c41fcebf7b9062a96b0fb1a3eef (patch) | |
tree | b94cb128a7a27ad53c28553ed96fc3f8eacd4aab /source/blender/nodes | |
parent | e12eb89f22c6ee17971195e0221a8e8b8ee3db8a (diff) | |
parent | b33d839162b6d4b8b85937eb095b661ac93cbddd (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_transform.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_transform.cc b/source/blender/nodes/geometry/nodes/node_geo_transform.cc index abfa603b584..4fe61dff72d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_transform.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_transform.cc @@ -92,6 +92,8 @@ static void transform_instances(InstancesComponent &instances, const float3 scale) { MutableSpan<float3> positions = instances.positions(); + MutableSpan<float3> rotations = instances.rotations(); + MutableSpan<float3> scales = instances.scales(); /* Use only translation if rotation and scale don't apply. */ if (use_translate(rotation, scale)) { @@ -101,9 +103,15 @@ static void transform_instances(InstancesComponent &instances, } else { float mat[4][4]; + float instance_mat[4][4]; + float quaternion[4]; + loc_eul_size_to_mat4(mat, translation, rotation, scale); - for (float3 &position : positions) { - mul_m4_v3(mat, position); + for (int i = 0; i < positions.size(); i++) { + loc_eul_size_to_mat4(instance_mat, positions[i], rotations[i], scales[i]); + mul_m4_m4_post(instance_mat, mat); + mat4_decompose(positions[i], quaternion, scales[i], instance_mat); + quat_to_eul(rotations[i], quaternion); } } } |