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:
authorJulian Eisel <julian@blender.org>2022-11-02 13:58:03 +0300
committerJulian Eisel <julian@blender.org>2022-11-02 13:58:03 +0300
commit7158e0eb4cfa32f49527f660f73031207bc8f8be (patch)
treea7e692d87ad8bd0a4dcb074844b4d3bcb500f27b /source/blender/blenkernel/intern/geometry_set.cc
parent75794f95c0d41fbc1d279058ec9293e69abdd5b2 (diff)
parent460c9d3d92e9f74254d58c6bb07d7e4fcb53e8b7 (diff)
Merge branch 'master' into blender-projects-basicsblender-projects-basics
Diffstat (limited to 'source/blender/blenkernel/intern/geometry_set.cc')
-rw-r--r--source/blender/blenkernel/intern/geometry_set.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc
index 90568a8a080..ee4c398c3d6 100644
--- a/source/blender/blenkernel/intern/geometry_set.cc
+++ b/source/blender/blenkernel/intern/geometry_set.cc
@@ -607,7 +607,10 @@ void GeometrySet::gather_attributes_for_propagation(
return;
}
}
-
+ if (meta_data.data_type == CD_PROP_STRING) {
+ /* Propagating string attributes is not supported yet. */
+ return;
+ }
if (!attribute_id.should_be_kept()) {
return;
}