[Bf-blender-cvs] [1765e1b20a0] temp-geometry-nodes-fields: Merge branch 'master' into temp-geometry-nodes-fields

[Hans Goudey]

Commit: 1765e1b20a06e7962890e4a4d9663e1f3451bff5
Author: Hans Goudey
Date:   Wed Sep 1 23:03:23 2021 -0500
Branches: temp-geometry-nodes-fields
https://developer.blender.org/rB1765e1b20a06e7962890e4a4d9663e1f3451bff5

Merge branch 'master' into temp-geometry-nodes-fields

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



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

diff --cc source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
index f77329826f8,6bc0ab49959..b36b12d8cf5
--- a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
@@@ -97,12 -93,13 +93,13 @@@ static void copy_dynamic_attributes(con
                                      const IndexMask mask)
  {
    src.foreach_attribute(
 -      [&](StringRefNull name, const AttributeMetaData &meta_data) {
 -        std::optional<GSpan> src_attribute = src.get_for_read(name);
 +      [&](const AttributeIDRef &attribute_id, const AttributeMetaData &meta_data) {
 +        std::optional<GSpan> src_attribute = src.get_for_read(attribute_id);
          BLI_assert(src_attribute);
  
 -        if (!dst.create(name, meta_data.data_type)) {
 +        if (!dst.create(attribute_id, meta_data.data_type)) {
-           /* Since the source spline of the same type had the attribute, adding it should work. */
+           /* Since the source spline of the same type had the attribute, adding it should work.
+            */
            BLI_assert_unreachable();
          }