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

Fix: Nodes: bring back node group name in viewer path

Browse Source 
This worked in e.g. Blender 4.0 but was broken at some point accidentally.
Now, the context path in the spreadsheet contains the names of node
groups again.
This commit is contained in:
Jacques Lucke
2025-05-06 08:51:18 +02:00
parent 4845ae8bf2
commit a7cce5abde
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/util/ed_viewer_path.cc
View File

@@ -45,6 +45,11 @@ ViewerPathElem *viewer_path_elem_for_compute_context(const ComputeContext &compu
if (const auto *context = dynamic_cast<const bke::GroupNodeComputeContext *>(&compute_context)) {
GroupNodeViewerPathElem *elem = BKE_viewer_path_elem_new_group_node();
elem->node_id = context->node_id();
if (const bNode *caller_node = context->caller_group_node()) {
if (const bNodeTree *group = reinterpret_cast<const bNodeTree *>(caller_node->id)) {
elem->base.ui_name = BLI_strdup(BKE_id_name(group->id));
}
}
return &elem->base;
}
if (const auto *context = dynamic_cast<const bke::SimulationZoneComputeContext *>(
@@ -453,6 +458,13 @@ UpdateActiveGeometryNodesViewerResult update_active_geometry_nodes_viewer(const
DEG_id_tag_update(snode.id, ID_RECALC_GEOMETRY);
return UpdateActiveGeometryNodesViewerResult::Updated;
}
if (!BKE_viewer_path_equal(
&viewer_path, &tmp_viewer_path, VIEWER_PATH_EQUAL_FLAG_CONSIDER_UI_NAME))
{
/* Only swap, without triggering a depsgraph update.*/
std::swap(viewer_path, tmp_viewer_path);
return UpdateActiveGeometryNodesViewerResult::Updated;
}
return UpdateActiveGeometryNodesViewerResult::StillActive;
}
}