griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Geometry Nodes: support searching for string and data-block values

Browse Source 
This extends the ctrl+F search to also support searching for some socket values.
The original motivation for this came from the need to search for a Warning node
by its warning (instead of node name or label). However, I found this to be more
generally useful as it can also be used to search for places where e.g. certain
attribute names are used or where e.g. some object is referenced in an input
socket.

Pull Request: https://projects.blender.org/blender/blender/pulls/146882
This commit is contained in:
Jacques Lucke
2025-09-27 17:21:25 +02:00
parent 25c84e90df
commit 986219bf37
1 changed files with 108 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
source/blender/editors/space_node/node_select.cc
View File

@@ -10,18 +10,25 @@
#include <cstdlib>
#include <fmt/format.h>
#include "DNA_collection_types.h"
#include "DNA_image_types.h"
#include "DNA_material_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
#include "DNA_windowmanager_types.h"
#include "BLI_lasso_2d.hh"
#include "BLI_listbase.h"
#include "BLI_math_vector.h"
#include "BLI_rect.h"
#include "BLI_resource_scope.hh"
#include "BLI_string.h"
#include "BLI_string_utf8.h"
#include "BLI_utildefines.h"
#include "BKE_context.hh"
#include "BKE_idtype.hh"
#include "BKE_lib_id.hh"
#include "BKE_main.hh"
#include "BKE_main_invariants.hh"
#include "BKE_node.hh"
@@ -49,6 +56,8 @@
#include "DEG_depsgraph.hh"
#include "BLT_translation.hh"
#include "node_intern.hh" /* own include */
namespace blender::ed::space_node {
@@ -1316,7 +1325,7 @@ void NODE_OT_select_same_type_step(wmOperatorType *ot)
/** \name Find Node by Name Operator
* \{ */
static std::string node_find_create_label(const bNodeTree &ntree, const bNode &node)
static std::string node_find_create_node_label(const bNodeTree &ntree, const bNode &node)
{
std::string label = bke::node_label(ntree, node);
if (label == node.name) {
@@ -1325,6 +1334,22 @@ static std::string node_find_create_label(const bNodeTree &ntree, const bNode &n
return fmt::format("{} ({})", label, node.name);
}
static std::string node_find_create_string_value(const bNode &node, const StringRef str)
{
return fmt::format("{}: \"{}\" ({})", TIP_("String"), str, node.name);
}
static std::string node_find_create_data_block_value(const bNode &node, const ID &id)
{
const IDTypeInfo *type = BKE_idtype_get_info_from_id(&id);
BLI_assert(type);
StringRef type_name = TIP_(type->name);
if (GS(id.name) == ID_NT) {
type_name = TIP_("Node Group");
}
return fmt::format("{}: \"{}\" ({})", type_name, BKE_id_name(id), node.name);
}
/* Generic search invoke. */
static void node_find_update_fn(const bContext *C,
void * /*arg*/,
@@ -1334,19 +1359,93 @@ static void node_find_update_fn(const bContext *C,
{
SpaceNode *snode = CTX_wm_space_node(C);
ui::string_search::StringSearch<bNode> search;
struct Item {
bNode *node;
std::string search_str;
};
ui::string_search::StringSearch<Item> search;
blender::ResourceScope scope;
auto add_data_block_item = [&](bNode &node, const ID *id) {
if (!id) {
return;
}
const StringRef search_str = scope.add_value(node_find_create_data_block_value(node, *id));
search.add(search_str, &scope.construct<Item>(Item{&node, search_str}));
};
const bNodeTree &ntree = *snode->edittree;
ntree.ensure_topology_cache();
for (bNode *node : snode->edittree->all_nodes()) {
const std::string name = node_find_create_label(ntree, *node);
search.add(name, node);
const StringRef name = scope.add_value(node_find_create_node_label(ntree, *node));
search.add(name, &scope.construct<Item>(Item{node, name}));
if (node->is_type("FunctionNodeInputString")) {
const auto *storage = static_cast<const NodeInputString *>(node->storage);
const StringRef value_str = storage->string;
if (!value_str.is_empty()) {
const StringRef search_str = scope.add_value(
node_find_create_string_value(*node, value_str));
search.add(search_str, &scope.construct<Item>(Item{node, search_str}));
}
}
if (node->id) {
/* Avoid showing referenced node group data-blocks twice. */
const bool skip_data_block =
node->is_group() &&
StringRef(bke::node_label(ntree, *node)).find(BKE_id_name(*node->id)) !=
StringRef::not_found;
if (!skip_data_block) {
add_data_block_item(*node, node->id);
}
}
for (const bNodeSocket *socket : node->input_sockets()) {
switch (socket->type) {
case SOCK_STRING: {
if (socket->is_logically_linked()) {
continue;
}
const bNodeSocketValueString *value =
socket->default_value_typed<bNodeSocketValueString>();
const StringRef value_str = value->value;
if (!value_str.is_empty()) {
const StringRef search_str = scope.add_value(
node_find_create_string_value(*node, value_str));
search.add(search_str, &scope.construct<Item>(Item{node, search_str}));
}
break;
}
case SOCK_OBJECT: {
add_data_block_item(
*node, id_cast<ID *>(socket->default_value_typed<bNodeSocketValueObject>()->value));
break;
}
case SOCK_MATERIAL: {
add_data_block_item(
*node,
id_cast<ID *>(socket->default_value_typed<bNodeSocketValueMaterial>()->value));
break;
}
case SOCK_COLLECTION: {
add_data_block_item(
*node,
id_cast<ID *>(socket->default_value_typed<bNodeSocketValueCollection>()->value));
break;
}
case SOCK_IMAGE: {
add_data_block_item(
*node, id_cast<ID *>(socket->default_value_typed<bNodeSocketValueImage>()->value));
break;
}
}
}
}
const Vector<bNode *> filtered_nodes = search.query(str);
for (bNode *node : filtered_nodes) {
const std::string name = node_find_create_label(ntree, *node);
if (!UI_search_item_add(items, name, node, ICON_NONE, 0, 0)) {
const Vector<Item *> filtered_items = search.query(str);
for (const Item *item : filtered_items) {
if (!UI_search_item_add(items, item->search_str, item->node, ICON_NONE, 0, 0)) {
break;
}
}