diff options
| author | Jacques Lucke <jacques@blender.org> | 2022-05-24 14:17:20 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2022-05-24 14:17:20 +0300 |
| commit | 089175bb1f6cb1105bc9d47a12bbc863c0df2a7f (patch) | |
| tree | 74e09414eae3d63532a9cfd9b1be4ec9f016a875 /source/blender/editors | |
| parent | 2ca66d541adfbbf9ac92bcabe8635e87c2834e46 (diff) | |
| parent | f29ff7fb7e19d8e8dd5dd01ac527f0675467fbf2 (diff) | |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_template_attribute_search.cc | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_geometry_attribute_search.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_template_attribute_search.cc b/source/blender/editors/interface/interface_template_attribute_search.cc index 384e9d1794e..dc8f568d025 100644 --- a/source/blender/editors/interface/interface_template_attribute_search.cc +++ b/source/blender/editors/interface/interface_template_attribute_search.cc @@ -40,8 +40,8 @@ static StringRef attribute_domain_string(const AttributeDomain domain) static bool attribute_search_item_add(uiSearchItems *items, const GeometryAttributeInfo &item) { - const StringRef data_type_name = attribute_data_type_string(item.data_type); - const StringRef domain_name = attribute_domain_string(item.domain); + const StringRef data_type_name = attribute_data_type_string(*item.data_type); + const StringRef domain_name = attribute_domain_string(*item.domain); std::string search_item_text = domain_name + " " + UI_MENU_ARROW_SEP + item.name + UI_SEP_CHAR + data_type_name; diff --git a/source/blender/editors/space_node/node_geometry_attribute_search.cc b/source/blender/editors/space_node/node_geometry_attribute_search.cc index fee64da0459..9c0172cfabf 100644 --- a/source/blender/editors/space_node/node_geometry_attribute_search.cc +++ b/source/blender/editors/space_node/node_geometry_attribute_search.cc @@ -183,9 +183,9 @@ static void attribute_search_exec_fn(bContext *C, void *data_v, void *item_v) BLI_assert(socket->type == SOCK_STRING); /* For the attribute input node, also adjust the type and links connected to the output. */ - if (node->type == GEO_NODE_INPUT_NAMED_ATTRIBUTE) { + if (node->type == GEO_NODE_INPUT_NAMED_ATTRIBUTE && item->data_type.has_value()) { NodeGeometryInputNamedAttribute &storage = *(NodeGeometryInputNamedAttribute *)node->storage; - const CustomDataType new_type = data_type_in_attribute_input_node(item->data_type); + const CustomDataType new_type = data_type_in_attribute_input_node(*item->data_type); if (new_type != storage.data_type) { storage.data_type = new_type; /* Make the output socket with the new type on the attribute input node active. */ |