blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 782 Projects 19 Wiki Activity

Fix: Viewer node crashes when the editor is pinned and has no Object ID #107737

Merged
Lukas Tönne merged 3 commits from LukasTonne/blender:fix_viewer_node_in_pinned_editor into main 2023-05-08 14:52:14 +02:00
Conversation 1 Commits 3 Files Changed 1 +34 -29
1 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6e11fe3da1 - Show all commits

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

@ -24,38 +24,39 @@ static void viewer_path_for_geometry_node(const SpaceNode &snode,
const bNode &node,
ViewerPath &r_dst)
{
/* Only valid if the node space has a context object. */
BLI_assert(snode.id != nullptr && GS(snode.id->name) == ID_OB);
Jacques Lucke commented 2023-05-08 13:22:35 +02:00
Outdated
Review
Copy Link

Better check for this in the caller and only add an assert here. It's not possible to build a viewer path for a geometry node when parts of the context path (including the object and modifier) are missing.

Better check for this in the caller and only add an assert here. It's not possible to build a viewer path for a geometry node when parts of the context path (including the object and modifier) are missing.
BKE_viewer_path_init(&r_dst);
if (snode.id != nullptr && GS(snode.id->name) == ID_OB) {
Object *ob = reinterpret_cast<Object *>(snode.id);
IDViewerPathElem *id_elem = BKE_viewer_path_elem_new_id();
id_elem->id = &ob->id;
BLI_addtail(&r_dst.path, id_elem);
Object *ob = reinterpret_cast<Object *>(snode.id);
IDViewerPathElem *id_elem = BKE_viewer_path_elem_new_id();
id_elem->id = &ob->id;
BLI_addtail(&r_dst.path, id_elem);
NodesModifierData *modifier = nullptr;
LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
if (md->type != eModifierType_Nodes) {
continue;
}
NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
if (nmd->node_group != snode.nodetree) {
continue;
}
if (snode.flag & SNODE_PIN) {
/* If the node group is pinned, use the first matching modifier. This can be improved by
* storing the modifier name in the node editor when the context is pinned. */
modifier = nmd;
break;
}
if (md->flag & eModifierFlag_Active) {
modifier = nmd;
}
NodesModifierData *modifier = nullptr;
LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
if (md->type != eModifierType_Nodes) {
continue;
}
if (modifier != nullptr) {
ModifierViewerPathElem *modifier_elem = BKE_viewer_path_elem_new_modifier();
modifier_elem->modifier_name = BLI_strdup(modifier->modifier.name);
BLI_addtail(&r_dst.path, modifier_elem);
NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
if (nmd->node_group != snode.nodetree) {
continue;
}
if (snode.flag & SNODE_PIN) {
/* If the node group is pinned, use the first matching modifier. This can be improved by
* storing the modifier name in the node editor when the context is pinned. */
modifier = nmd;
break;
}
if (md->flag & eModifierFlag_Active) {
modifier = nmd;
}
}
if (modifier != nullptr) {
ModifierViewerPathElem *modifier_elem = BKE_viewer_path_elem_new_modifier();
modifier_elem->modifier_name = BLI_strdup(modifier->modifier.name);
BLI_addtail(&r_dst.path, modifier_elem);
}
Vector<const bNodeTreePath *, 16> tree_path = snode.treepath;
@ -89,7 +90,9 @@ void activate_geometry_node(Main &bmain, SpaceNode &snode, bNode &node)
}
ViewerPath new_viewer_path{};
BLI_SCOPED_DEFER([&]() { BKE_viewer_path_clear(&new_viewer_path); });
viewer_path_for_geometry_node(snode, node, new_viewer_path);
if (snode.id != nullptr && GS(snode.id->name) == ID_OB) {
viewer_path_for_geometry_node(snode, node, new_viewer_path);
}
bool found_view3d_with_enabled_viewer = false;
View3D *any_view3d_without_viewer = nullptr;
@ -356,7 +359,9 @@ bNode *find_geometry_nodes_viewer(const ViewerPath &viewer_path, SpaceNode &snod
}
ViewerPath tmp_viewer_path;
BLI_SCOPED_DEFER([&]() { BKE_viewer_path_clear(&tmp_viewer_path); });
viewer_path_for_geometry_node(snode, *possible_viewer, tmp_viewer_path);
if (snode.id != nullptr && GS(snode.id->name) == ID_OB) {
Jacques Lucke commented 2023-05-08 13:58:12 +02:00
Outdated
Review
Copy Link

Return early when the snode.id is invalid.

Return early when the `snode.id` is invalid.
Lukas Tönne commented 2023-05-08 14:08:40 +02:00
Outdated
Review
Copy Link

It looks to me like the rest of the function should still run even if the viewer path is not valid?

It looks to me like the rest of the function should still run even if the viewer path is not valid?
Jacques Lucke commented 2023-05-08 14:10:59 +02:00
Outdated
Review
Copy Link

I think the function isn't able to find the viewer node if the snode.id is invalid. So there isn't really a point in running the rest of the function, is there?

I think the function isn't able to find the viewer node if the `snode.id` is invalid. So there isn't really a point in running the rest of the function, is there?
Lukas Tönne commented 2023-05-08 14:23:46 +02:00
Outdated
Review
Copy Link

Oh i was looking at the other caller, they look so similar (tmp_viewer_path vs new_viewer_path). Will fix.

Oh i was looking at the other caller, they look so similar (`tmp_viewer_path` vs `new_viewer_path`). Will fix.
viewer_path_for_geometry_node(snode, *possible_viewer, tmp_viewer_path);
}
if (BKE_viewer_path_equal(&viewer_path, &tmp_viewer_path)) {
return possible_viewer;