diff options
author | Hans Goudey <h.goudey@me.com> | 2021-02-24 02:15:03 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-02-24 02:15:03 +0300 |
commit | b2c7ea6d82c453cfa35bf754e07dbbf08ae0a018 (patch) | |
tree | 7ff8fdb445087a30e130850a3ba197a035980620 /source/blender/editors | |
parent | dde7d4417a850222c2e05bd6fc8f6c354f2515e9 (diff) |
Geometry Nodes: Move node UI storage function to BKE
This function will be used in another file with attribute search,
so it makes sense to share from the UI storage header.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_node/node_draw.cc | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc index d0b62463ad9..40d62b0b10f 100644 --- a/source/blender/editors/space_node/node_draw.cc +++ b/source/blender/editors/space_node/node_draw.cc @@ -81,9 +81,7 @@ # include "COM_compositor.h" #endif -using blender::Map; using blender::Span; -using blender::StringRef; using blender::Vector; extern "C" { @@ -1254,34 +1252,10 @@ static char *node_errors_tooltip_fn(bContext *UNUSED(C), void *argN, const char #define NODE_HEADER_ICON_SIZE (0.8f * U.widget_unit) -static const NodeUIStorage *node_ui_storage_get_from_context(const bContext *C, - const bNodeTree &ntree, - const bNode &node) -{ - const NodeTreeUIStorage *ui_storage = ntree.ui_storage; - if (ui_storage == nullptr) { - return nullptr; - } - - const Object *active_object = CTX_data_active_object(C); - const ModifierData *active_modifier = BKE_object_active_modifier(active_object); - if (active_object == nullptr || active_modifier == nullptr) { - return nullptr; - } - - const NodeTreeEvaluationContext context(*active_object, *active_modifier); - const Map<std::string, NodeUIStorage> *storage = ui_storage->context_map.lookup_ptr(context); - if (storage == nullptr) { - return nullptr; - } - - return storage->lookup_ptr_as(StringRef(node.name)); -} - static void node_add_error_message_button( const bContext *C, bNodeTree &ntree, bNode &node, const rctf &rect, float &icon_offset) { - const NodeUIStorage *node_ui_storage = node_ui_storage_get_from_context(C, ntree, node); + const NodeUIStorage *node_ui_storage = BKE_node_tree_ui_storage_get_from_context(C, ntree, node); if (node_ui_storage == nullptr || node_ui_storage->warnings.is_empty()) { return; } |