[Bf-blender-cvs] [46ee9b599ae] master: Fix T87094: Transforming geometry instances component is broken
Hans Goudey
noreply at git.blender.org
Wed Mar 31 18:33:18 CEST 2021
Commit: 46ee9b599aeec6400bf6ff7d87431d71fb87a2e0
Author: Hans Goudey
Date: Wed Mar 31 11:32:52 2021 -0500
Branches: master
https://developer.blender.org/rB46ee9b599aeec6400bf6ff7d87431d71fb87a2e0
Fix T87094: Transforming geometry instances component is broken
Caused by an incorrect transformation order in cleanup commit
rBd037fef3bd1dc2e. The fix is to simply reverse the order.
===================================================================
M source/blender/nodes/geometry/nodes/node_geo_transform.cc
===================================================================
diff --git a/source/blender/nodes/geometry/nodes/node_geo_transform.cc b/source/blender/nodes/geometry/nodes/node_geo_transform.cc
index 83525aa0d22..2c05c98c9ba 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_transform.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_transform.cc
@@ -111,7 +111,7 @@ static void transform_instances(InstancesComponent &instances,
else {
const float4x4 matrix = float4x4::from_loc_eul_scale(translation, rotation, scale);
for (float4x4 &transform : transforms) {
- transform = transform * matrix;
+ transform = matrix * transform;
}
}
}
More information about the Bf-blender-cvs
mailing list