[Bf-blender-cvs] [5be8cc65562] temp-geometry-nodes-text: FIx: Change to instance domain

[Erik]

Commit: 5be8cc65562addcd3f9b52011faa2cdd2427a7a4
Author: Erik
Date:   Wed Nov 24 01:29:45 2021 +0100
Branches: temp-geometry-nodes-text
https://developer.blender.org/rB5be8cc65562addcd3f9b52011faa2cdd2427a7a4

FIx: Change to instance domain

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

M       source/blender/blenkernel/BKE_geometry_set.hh
M       source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc

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

diff --git a/source/blender/blenkernel/BKE_geometry_set.hh 
b/source/blender/blenkernel/BKE_geometry_set.hh
index fb2acfb428b..35e66908d54 100644
--- a/source/blender/blenkernel/BKE_geometry_set.hh
+++ b/source/blender/blenkernel/BKE_geometry_set.hh
@@ -654,7 +654,6 @@ class InstancesComponent : public GeometryComponent {
   blender::bke::CustomDataAttributes attributes_;
 
  public:
-  blender::bke::CustomDataAttributes attributes;
   InstancesComponent();
   ~InstancesComponent() = default;
   GeometryComponent *copy() const override;
diff --git a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc 
b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
index 592f83d1e92..965e674ee94 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
@@ -351,7 +351,7 @@ static void create_attributes(GeoNodeExecParams &params,
 
   if (line_id) {
     line_attribute = 
instances.attribute_try_get_for_output_only<int>(line_id.get(),
-                                                                      
ATTR_DOMAIN_POINT);
+                                                                      
ATTR_DOMAIN_INSTANCE);
     lines = line_attribute.as_span();
   }
 
@@ -363,7 +363,7 @@ static void create_attributes(GeoNodeExecParams &params,
 
   if (pivot_id) {
     pivot_attribute = 
instances.attribute_try_get_for_output_only<float3>(pivot_id.get(),
-                                                                          
ATTR_DOMAIN_POINT);
+                                                                          
ATTR_DOMAIN_INSTANCE);
     pivots = pivot_attribute.as_span();
   }
 
@@ -394,7 +394,7 @@ static void create_attributes(GeoNodeExecParams &params,
   }
 }
 
-static void geo_node_string_to_curves_exec(GeoNodeExecParams params)
+static void node_geo_exec(GeoNodeExecParams params)
 {
   TextLayout layout = get_text_layout(params);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs