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:
authorJacques Lucke <jacques@blender.org>2021-02-12 14:34:41 +0300
committerJacques Lucke <jacques@blender.org>2021-02-12 14:34:41 +0300
commitfd8ac0b0f4384f9baed0935f23fbcab8b8068715 (patch)
tree2862720434bec100a69f59af47302ffde0982d99
parented667e344d7e9f72f2b1a0302e241606276a06ae (diff)
parent9fa6e06287dc49f1fcf2bbfa150c0ff368668fed (diff)
Merge branch 'blender-v2.92-release'
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_point_separate.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_separate.cc b/source/blender/nodes/geometry/nodes/node_geo_point_separate.cc
index 066b2952111..5f9d208a440 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_point_separate.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_separate.cc
@@ -84,19 +84,15 @@ static void move_split_attributes(const GeometryComponent &in_component,
const CustomDataType data_type = bke::cpp_type_to_custom_data_type(attribute->cpp_type());
const AttributeDomain domain = attribute->domain();
- /* Don't try to create the attribute on the new component if it already exists. Built-in
- * attributes will already exist on new components by definition. It should always be possible
- * to recreate the attribute on the same component type. Also, if one of the new components
- * has the attribute the other one should have it too, but check independently to be safe. */
+ /* Don't try to create the attribute on the new component if it already exists (i.e. has been
+ * initialized by someone else). */
if (!out_component_a.attribute_exists(name)) {
if (!out_component_a.attribute_try_create(name, domain, data_type)) {
- BLI_assert(false);
continue;
}
}
if (!out_component_b.attribute_exists(name)) {
if (!out_component_b.attribute_try_create(name, domain, data_type)) {
- BLI_assert(false);
continue;
}
}