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/blenkernel | |
parent | e12eb89f22c6ee17971195e0221a8e8b8ee3db8a (diff) | |
parent | b33d839162b6d4b8b85937eb095b661ac93cbddd (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_geometry_set.hh | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/geometry_set.cc | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_geometry_set.hh b/source/blender/blenkernel/BKE_geometry_set.hh index 391bd243edf..ad5a5d57045 100644 --- a/source/blender/blenkernel/BKE_geometry_set.hh +++ b/source/blender/blenkernel/BKE_geometry_set.hh @@ -456,6 +456,8 @@ class InstancesComponent : public GeometryComponent { blender::Span<blender::float3> scales() const; blender::Span<int> ids() const; blender::MutableSpan<blender::float3> positions(); + blender::MutableSpan<blender::float3> rotations(); + blender::MutableSpan<blender::float3> scales(); int instances_amount() const; bool is_empty() const final; diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc index 5d2b82dcc5f..81958b81213 100644 --- a/source/blender/blenkernel/intern/geometry_set.cc +++ b/source/blender/blenkernel/intern/geometry_set.cc @@ -540,6 +540,16 @@ MutableSpan<float3> InstancesComponent::positions() return positions_; } +MutableSpan<float3> InstancesComponent::rotations() +{ + return rotations_; +} + +MutableSpan<float3> InstancesComponent::scales() +{ + return scales_; +} + int InstancesComponent::instances_amount() const { const int size = instanced_data_.size(); |