diff options
author | Hans Goudey <h.goudey@me.com> | 2022-03-31 04:54:11 +0300 |
---|---|---|
committer | Fabian Schempp <fabianschempp@googlemail.com> | 2022-04-11 01:31:51 +0300 |
commit | f7edbc44ba08a6fde875359fe0bcb50b0510ffd8 (patch) | |
tree | 3ab7361c585c5cbf11e34235b4f45ef494055c2e /source/blender/editors/space_node/node_geometry_attribute_search.cc | |
parent | b0d4d5a2956eb0b112d7fb075587869f98dbf4d6 (diff) |
Cleanup: Avoid storing pointers for attribute search callback
It's better to use some local/stable identifiier to avoid relying on
the data not being freed in between creating the search menu and
the exec function. This is similar to c473b2ce8bdbf8fa.
Diffstat (limited to 'source/blender/editors/space_node/node_geometry_attribute_search.cc')
-rw-r--r-- | source/blender/editors/space_node/node_geometry_attribute_search.cc | 42 |
1 files changed, 31 insertions, 11 deletions
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 5a6fe911a05..4a0f3b9a1f2 100644 --- a/source/blender/editors/space_node/node_geometry_attribute_search.cc +++ b/source/blender/editors/space_node/node_geometry_attribute_search.cc @@ -38,9 +38,8 @@ using geo_log::GeometryAttributeInfo; namespace blender::ed::space_node { struct AttributeSearchData { - const bNodeTree *tree; - const bNode *node; - bNodeSocket *socket; + char node_name[MAX_NAME]; + char socket_identifier[MAX_NAME]; }; /* This class must not have a destructor, since it is used by buttons and freed with #MEM_freeN. */ @@ -57,7 +56,7 @@ static void attribute_search_update_fn( SpaceNode *snode = CTX_wm_space_node(C); const geo_log::NodeLog *node_log = geo_log::ModifierLog::find_node_by_node_editor_context( - *snode, *data->node); + *snode, data->node_name); if (node_log == nullptr) { return; } @@ -71,21 +70,40 @@ static void attribute_search_exec_fn(bContext *C, void *data_v, void *item_v) if (ED_screen_animation_playing(CTX_wm_manager(C))) { return; } - if (item_v == nullptr) { + GeometryAttributeInfo *item = (GeometryAttributeInfo *)item_v; + if (item == nullptr) { + return; + } + SpaceNode *snode = CTX_wm_space_node(C); + if (!snode) { + BLI_assert_unreachable(); + return; + } + bNodeTree *node_tree = snode->edittree; + if (node_tree == nullptr) { + BLI_assert_unreachable(); return; } AttributeSearchData *data = static_cast<AttributeSearchData *>(data_v); - GeometryAttributeInfo *item = (GeometryAttributeInfo *)item_v; + bNode *node = nodeFindNodebyName(node_tree, data->node_name); + if (node == nullptr) { + BLI_assert_unreachable(); + return; + } + bNodeSocket *socket = bke::node_find_enabled_input_socket(*node, data->socket_identifier); + if (socket == nullptr) { + BLI_assert_unreachable(); + return; + } + BLI_assert(socket->type == SOCK_STRING); - bNodeSocket &socket = *data->socket; - bNodeSocketValueString *value = static_cast<bNodeSocketValueString *>(socket.default_value); + bNodeSocketValueString *value = static_cast<bNodeSocketValueString *>(socket->default_value); BLI_strncpy(value->value, item->name.c_str(), MAX_NAME); ED_undo_push(C, "Assign Attribute Name"); } void node_geometry_add_attribute_search_button(const bContext &UNUSED(C), - const bNodeTree &node_tree, const bNode &node, PointerRNA &socket_ptr, uiLayout &layout) @@ -109,8 +127,10 @@ void node_geometry_add_attribute_search_button(const bContext &UNUSED(C), 0.0f, ""); - AttributeSearchData *data = MEM_new<AttributeSearchData>( - __func__, AttributeSearchData{&node_tree, &node, (bNodeSocket *)socket_ptr.data}); + const bNodeSocket &socket = *static_cast<const bNodeSocket *>(socket_ptr.data); + AttributeSearchData *data = MEM_new<AttributeSearchData>(__func__); + BLI_strncpy(data->node_name, node.name, sizeof(data->node_name)); + BLI_strncpy(data->socket_identifier, socket.identifier, sizeof(data->socket_identifier)); UI_but_func_search_set_results_are_suggestions(but, true); UI_but_func_search_set_sep_string(but, UI_MENU_ARROW_SEP); |