[Bf-blender-cvs] [794d63bb7ee] refactor-mesh-sharp-face-generic: Merge branch 'master' into refactor-mesh-sharp-face-generic

[Hans Goudey]

Commit: 794d63bb7eed6d30753a0d2bf902276cf36e7e9b
Author: Hans Goudey
Date:   Thu Jan 5 13:59:14 2023 -0500
Branches: refactor-mesh-sharp-face-generic
https://developer.blender.org/rB794d63bb7eed6d30753a0d2bf902276cf36e7e9b

Merge branch 'master' into refactor-mesh-sharp-face-generic

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



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

diff --cc source/blender/geometry/intern/realize_instances.cc
index 7f2ef62a4d7,9729d31779c..26696618884
--- a/source/blender/geometry/intern/realize_instances.cc
+++ b/source/blender/geometry/intern/realize_instances.cc
@@@ -829,10 -832,14 +832,13 @@@ static OrderedAttributes gather_generic
    }
  
    Map<AttributeIDRef, AttributeKind> attributes_to_propagate;
-   in_geometry_set.gather_attributes_for_propagation(
-       src_component_types, GEO_COMPONENT_TYPE_MESH, true, attributes_to_propagate);
+   in_geometry_set.gather_attributes_for_propagation(src_component_types,
+                                                     GEO_COMPONENT_TYPE_MESH,
+                                                     true,
+                                                     options.propagation_info,
+                                                     attributes_to_propagate);
    attributes_to_propagate.remove("position");
    attributes_to_propagate.remove("normal");
 -  attributes_to_propagate.remove("shade_smooth");
    r_create_id = attributes_to_propagate.pop_try("id").has_value();
    r_create_material_index = attributes_to_propagate.pop_try("material_index").has_value();
    OrderedAttributes ordered_attributes;