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
Member

This case was not properly handled by the previous fix in #107621.

The viewer node path function still assumes that the node editor space
has a valid ID pointer (snode.id) and that it is an Object.
The ID pointer can be null when setting a pinned node tree through the
python API, like so:

space.pin = True
space.node_tree = some_other_node_tree

In this case the ED_node_tree_start function is called without and ID
pointer, which is allowed! This patch makes sure that the viewer node
path function is only used with a valid object context.

This case was not properly handled by the previous fix in #107621. The viewer node path function still assumes that the node editor space has a valid ID pointer (`snode.id`) and that it is an `Object`. The ID pointer can be null when setting a pinned node tree through the python API, like so: ```Py space.pin = True space.node_tree = some_other_node_tree ``` In this case the `ED_node_tree_start` function is called without and ID pointer, which is allowed! This patch makes sure that the viewer node path function is only used with a valid object context.
Lukas Tönne added 1 commit 2023-05-08 13:17:53 +02:00
ad2ef73160 Fix: Viewer node crashes when the editor is pinned and has no Object ID.
This case was not properly handled by the previous fix in #107621.

The viewer node path function still assumes that the node editor space
has a valid ID pointer (`snode.id`) and that it is an `Object`.
The ID pointer can be null when setting a pinned node tree through the
python API, like so:
```
space.pin = True
space.node_tree = some_other_node_tree
```

In this case the `ED_node_tree_start` function is called without and ID
pointer, which is allowed! The viewer node path function needs to handle
this case.
Lukas Tönne added this to the Nodes & Physics project 2023-05-08 13:18:02 +02:00
Lukas Tönne requested review from Jacques Lucke 2023-05-08 13:18:16 +02:00
Author
Member

Small repro file:

  1. Run the script to set a pinned node tree
  2. Shift+Click on the Group Input node to try and make a viewer connection (crashes)
Small repro file: 1. Run the script to set a pinned node tree 2. Shift+Click on the Group Input node to try and make a viewer connection (crashes)
Jacques Lucke requested changes 2023-05-08 13:23:09 +02:00
@ -30,3 +29,1 @@
IDViewerPathElem *id_elem = BKE_viewer_path_elem_new_id();
id_elem->id = &ob->id;
BLI_addtail(&r_dst.path, id_elem);
if (snode.id != nullptr && GS(snode.id->name) == ID_OB) {
Member

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.
Lukas Tönne added 1 commit 2023-05-08 13:51:15 +02:00
Lukas Tönne requested review from Jacques Lucke 2023-05-08 13:51:45 +02:00
Jacques Lucke approved these changes 2023-05-08 13:58:15 +02:00
@ -355,3 +360,3 @@
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) {
Member

Return early when the snode.id is invalid.

Return early when the `snode.id` is invalid.
Author
Member

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?
Member

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?
Author
Member

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.
Hans Goudey changed title from Fix: Viewer node crashes when the editor is pinned and has no Object ID. to Fix: Viewer node crashes when the editor is pinned and has no Object ID 2023-05-08 14:02:47 +02:00
Lukas Tönne added 1 commit 2023-05-08 14:26:24 +02:00
Lukas Tönne merged commit 967cd7f99e into main 2023-05-08 14:52:14 +02:00
Lukas Tönne deleted branch fix_viewer_node_in_pinned_editor 2023-05-08 14:52:15 +02:00
Howard Trickey referenced this issue from a commit 2023-05-29 02:51:41 +02:00
Sign in to join this conversation.
No reviewers
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#107737
No description provided.