[Bf-blender-cvs] [c853826ed14] temp-geometry-nodes-text: Merge branch 'master' into temp-geometry-nodes-text

[Erik]

Commit: c853826ed14b38e0f07d8b09e1cbe9fb25556474
Author: Erik
Date:   Tue Nov 23 17:59:13 2021 +0100
Branches: temp-geometry-nodes-text
https://developer.blender.org/rBc853826ed14b38e0f07d8b09e1cbe9fb25556474

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

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



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

diff --cc source/blender/blenkernel/BKE_geometry_set.hh
index e912b2037ba,35e66908d54..fb2acfb428b
--- a/source/blender/blenkernel/BKE_geometry_set.hh
+++ b/source/blender/blenkernel/BKE_geometry_set.hh
@@@ -637,8 -651,9 +651,10 @@@ class InstancesComponent : public Geome
    mutable std::mutex almost_unique_ids_mutex_;
    mutable blender::Array<int> almost_unique_ids_;
  
+   blender::bke::CustomDataAttributes attributes_;
+ 
   public:
 +  blender::bke::CustomDataAttributes attributes;
    InstancesComponent();
    ~InstancesComponent() = default;
    GeometryComponent *copy() const override;
diff --cc source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
index 342dc22ee49,6a793e12f82..592f83d1e92
--- a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
@@@ -30,11 -30,11 +30,11 @@@
  
  #include "node_geometry_util.hh"
  
- namespace blender::nodes {
+ namespace blender::nodes::node_geo_string_to_curves_cc {
  
- static void geo_node_string_to_curves_declare(NodeDeclarationBuilder &b)
+ static void node_declare(NodeDeclarationBuilder &b)
  {
 -  b.add_input<decl::String>(N_("String"));
 +  b.add_input<decl::String>(N_("String")).default_value("Text");
    b.add_input<decl::Float>(N_("Size")).default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE);
    b.add_input<decl::Float>(N_("Character Spacing"))
        .default_value(1.0f)
@@@ -56,13 -56,11 +56,13 @@@
        .default_value(0.0f)
        .min(0.0f)
        .subtype(PROP_DISTANCE);
 -  b.add_output<decl::Geometry>(N_("Curves"));
 +  b.add_output<decl::Geometry>(N_("Curve Instances"));
    b.add_output<decl::String>(N_("Remainder"));
 +  b.add_output<decl::Int>(N_("Line")).field_source();
 +  b.add_output<decl::Vector>(N_("Pivot Point")).field_source();
  }
  
- static void geo_node_string_to_curves_layout(uiLayout *layout, struct bContext *C, PointerRNA *ptr)
+ static void node_layout(uiLayout *layout, struct bContext *C, PointerRNA *ptr)
  {
    uiLayoutSetPropSep(layout, true);
    uiLayoutSetPropDecorate(layout, false);
@@@ -79,10 -77,9 +79,10 @@@
    uiItemR(layout, ptr, "overflow", 0, "", ICON_NONE);
    uiItemR(layout, ptr, "align_x", 0, "", ICON_NONE);
    uiItemR(layout, ptr, "align_y", 0, "", ICON_NONE);
 +  uiItemR(layout, ptr, "pivot_mode", 0, IFACE_("Pivot Point"), ICON_NONE);
  }
  
- static void geo_node_string_to_curves_init(bNodeTree *UNUSED(ntree), bNode *node)
+ static void node_init(bNodeTree *UNUSED(ntree), bNode *node)
  {
    NodeGeometryStringToCurves *data = (NodeGeometryStringToCurves *)MEM_callocN(
        sizeof(NodeGeometryStringToCurves), __func__);
@@@ -410,14 -283,21 +412,14 @@@ static void geo_node_string_to_curves_e
    /* Create and add instances. */
    GeometrySet geometry_set_out;
    InstancesComponent &instances = geometry_set_out.get_component_for_write<InstancesComponent>();
 -  Map<int, int> char_handles = create_curve_instances(
 -      params, layout.final_font_size, char_codes, instances);
 -  add_instances_from_handles(instances, char_handles, char_codes, layout.positions);
 +  Map<int, int> char_handles = create_curve_instances(params, layout, instances);
 +  add_instances_from_handles(instances, char_handles, layout);
 +  create_attributes(params, layout, instances);
  
 -  params.set_output("Curves", std::move(geometry_set_out));
 +  params.set_output("Curve Instances", std::move(geometry_set_out));
  }
  
- }  // namespace blender::nodes
+ }  // namespace blender::nodes::node_geo_string_to_curves_cc
  
  void register_node_type_geo_string_to_curves()
  {