Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2021-01-14 17:55:51 +0300
committerJacques Lucke <jacques@blender.org>2021-01-14 17:55:51 +0300
commit9131c697ddda0ad640167d9f52e97bb697e187d0 (patch)
treec73ec2089ab6611569f849c07eb5ccd2cb009caf /source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
parent87955143845230919326914e5377f76ce231d306 (diff)
parente5ee7e9a2df93d7f28f9e1f8bc0eb2d33dfadfb4 (diff)
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc')
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc b/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
index 46b29a08feb..5e9b780db6d 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
@@ -248,11 +248,11 @@ BLI_NOINLINE static void add_remaining_point_attributes(const Mesh &mesh,
Span<float3> bary_coords,
Span<int> looptri_indices)
{
- WriteAttributePtr id_attribute = component.attribute_try_ensure_for_write(
+ OutputAttributePtr id_attribute = component.attribute_try_get_for_output(
"id", ATTR_DOMAIN_POINT, CD_PROP_INT32);
- WriteAttributePtr normal_attribute = component.attribute_try_ensure_for_write(
+ OutputAttributePtr normal_attribute = component.attribute_try_get_for_output(
"normal", ATTR_DOMAIN_POINT, CD_PROP_FLOAT3);
- WriteAttributePtr rotation_attribute = component.attribute_try_ensure_for_write(
+ OutputAttributePtr rotation_attribute = component.attribute_try_get_for_output(
"rotation", ATTR_DOMAIN_POINT, CD_PROP_FLOAT3);
compute_special_attributes(mesh,
@@ -262,9 +262,9 @@ BLI_NOINLINE static void add_remaining_point_attributes(const Mesh &mesh,
id_attribute->get_span_for_write_only<int>(),
rotation_attribute->get_span_for_write_only<float3>());
- id_attribute->apply_span();
- normal_attribute->apply_span();
- rotation_attribute->apply_span();
+ id_attribute.apply_span_and_save();
+ normal_attribute.apply_span_and_save();
+ rotation_attribute.apply_span_and_save();
}
static void sample_mesh_surface_with_minimum_distance(const Mesh &mesh,