Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik <ecke101@gmail.com>2021-11-24 03:29:45 +0300
committerErik <ecke101@gmail.com>2021-11-24 03:29:45 +0300
commit5be8cc65562addcd3f9b52011faa2cdd2427a7a4 (patch)
tree67a5f1ec8b66589e5940ea8feffb6c4ddf066cb3
parentc853826ed14b38e0f07d8b09e1cbe9fb25556474 (diff)
FIx: Change to instance domaintemp-geometry-nodes-text
-rw-r--r--source/blender/blenkernel/BKE_geometry_set.hh1
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc6
2 files changed, 3 insertions, 4 deletions
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);