diff options
author | Sebastian Parborg <darkdefende@gmail.com> | 2021-01-26 20:25:16 +0300 |
---|---|---|
committer | Sebastian Parborg <darkdefende@gmail.com> | 2021-01-26 20:25:16 +0300 |
commit | 6157c45445dceb0bceabb5b9ea80cd6eb60e04fc (patch) | |
tree | 4806227abeffabf3d941f0b4796051da221bb6d6 /source/blender/nodes | |
parent | 82523840cd40359a6c60bcc60983762eca87d17b (diff) |
Fix T85049: Geometry Nodes: How to handle instances with shear? (part2)
Update to changes in master.
Reviewed By: JacquesLucke
Differential Revision: http://developer.blender.org/D10211
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_object_info.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc index fe0303a5f1c..d713c191d5d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc @@ -91,10 +91,12 @@ static void geo_node_object_info_exec(GeoNodeExecParams params) InstancesComponent &instances = geometry_set.get_component_for_write<InstancesComponent>(); if (transform_space_relative) { - instances.add_instance(object, location, rotation, scale); + instances.add_instance(object, transform); } else { - instances.add_instance(object, {0, 0, 0}); + float unit_transform[4][4]; + unit_m4(unit_transform); + instances.add_instance(object, unit_transform); } } } |