Fix #106467: Crash when loading files with custom node groups #106559

Merged
Jacques Lucke merged 3 commits from Bobbe/blender:main into main 2023-04-05 15:36:35 +02:00
Contributor

Loading a blend file containing custom material node groups currently crashes Blender. See #106467 for more information.

Loading a blend file containing custom material node groups currently crashes Blender. See #106467 for more information.
Max Schlecht added 1 commit 2023-04-04 17:38:37 +02:00
Max Schlecht added 1 commit 2023-04-04 17:39:33 +02:00
Max Schlecht requested review from Iliya Katushenock 2023-04-04 17:40:03 +02:00
Iliya Katushenock reviewed 2023-04-04 17:43:30 +02:00
@ -926,3 +926,3 @@
/* Don't update node groups here because they may depend on other node groups which are not
* fully versioned yet and don't have `typeinfo` pointers set. */
if (node->type != NODE_GROUP) {
if (node->type != NODE_GROUP && node->type != NODE_CUSTOM_GROUP) {

Maybe better node->is_group() ?

Maybe better `node->is_group()` ?
Bobbe marked this conversation as resolved
Iliya Katushenock added this to the Nodes & Physics project 2023-04-04 17:43:45 +02:00
Iliya Katushenock requested review from Jacques Lucke 2023-04-04 17:44:04 +02:00
Iliya Katushenock changed title from Fix crash when loading files with custom node groups (#106467) to Fix #106467: Crash when loading files with custom node groups 2023-04-04 17:44:28 +02:00
Iliya Katushenock refused to review 2023-04-04 17:47:21 +02:00
Iliya Katushenock requested review from Hans Goudey 2023-04-04 17:47:22 +02:00
Max Schlecht added 1 commit 2023-04-04 17:48:28 +02:00
Author
Contributor

@mod_moder Thanks! Didn't know about node->isgroup() that makes much more sense.

@mod_moder Thanks! Didn't know about `node->isgroup()` that makes much more sense.

Perhaps if this bug were in a month, it would have been fixed simply by the cleanup of the code that I lead. She would immediately change this flag check to a method.

Perhaps if this bug were in a month, it would have been fixed simply by the cleanup of the code that I lead. She would immediately change this flag check to a method.
Jacques Lucke approved these changes 2023-04-05 15:35:46 +02:00
Jacques Lucke left a comment
Member

Thanks for the fix!

Thanks for the fix!
Jacques Lucke merged commit ad031029cf into main 2023-04-05 15:36:35 +02:00
Author
Contributor

Thanks for merging! Will this get merged into 3.5.1 aswell?

Thanks for merging! Will this get merged into 3.5.1 aswell?
Member

I added it to the list in #106258. The release team will decide if it is backported, but given that this is a very simple fix, it's very likely.

I added it to the list in #106258. The release team will decide if it is backported, but given that this is a very simple fix, it's very likely.
Author
Contributor

Ah okay, perfect! Didn't know how that worked exactly, just saw that it was only present on main yet. Thanks a lot!

Ah okay, perfect! Didn't know how that worked exactly, just saw that it was only present on main yet. Thanks a lot!
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
3 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#106559
No description provided.