[Bf-blender-cvs] [9131c697ddd] master: Merge branch 'blender-v2.92-release'

[Jacques Lucke]

Commit: 9131c697ddda0ad640167d9f52e97bb697e187d0
Author: Jacques Lucke
Date:   Thu Jan 14 15:55:51 2021 +0100
Branches: master
https://developer.blender.org/rB9131c697ddda0ad640167d9f52e97bb697e187d0

Merge branch 'blender-v2.92-release'

===================================================================



===================================================================

diff --cc source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
index 46b29a08feb,2f1aa276532..5e9b780db6d
--- a/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
@@@ -243,30 -243,6 +243,30 @@@ BLI_NOINLINE static void compute_specia
    }
  }
  
 +BLI_NOINLINE static void add_remaining_point_attributes(const Mesh &mesh,
 +                                                        GeometryComponent &component,
 +                                                        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,
 +                             bary_coords,
 +                             looptri_indices,
 +                             normal_attribute->get_span_for_write_only<float3>(),
 +                             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,
                                                        const float max_density,
                                                        const float minimum_distance,