Fix #117422: Move undefined type removal behind after-linking-versioning #117441
No reviewers
Labels
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 project
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: blender/blender#117441
Loading…
Reference in New Issue
No description provided.
Delete Branch "LukasTonne/blender:fix-node-versioning"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
There are still node versioning bits running after linking, for example
version_geometry_nodes_replace_transfer_attribute_node
. This coderelies on node types being untouched at that point.
Move the unknown node type replacement from
ntreeSetTypes
into thentreeUpdateAllNew
function. This is called after late versioning.@blender-bot build
Nodes: Move undefined type removal behind after-linking-versioningto Fix #117422: Move undefined type removal behind after-linking-versioningI think comments could use a bit of update here, otherwise patch LGTM.
@ -4097,0 +4083,4 @@
static void node_replace_undefined_types(bNode *node)
{
/* If the integer type is unknown then this is a node from a newer Blender version.
Since there are issues with versioning of old files, I'd assume this can also happen with older files, and mot only newer ones?
Maybe actually this comment would be better placed in the calling function (
ntreeUpdateAllNew
), since there, at this stage of the blendfile reading process, it can be assumed that unknown types only come from future versions of Blender?True, although to my knowledge there's never been a case where a node type was deliberately removed (other than replaced by a newer version as in #117422 ). In that case there should already be code for removing such nodes, otherwise backward compatibility would be broken.
The case with newer nodes is a little more subtle: Blender would still try to read such nodes but can't write them again properly, they have to be removed to prevent bad blend file state.
@ -4097,2 +4099,4 @@
void ntreeUpdateAllNew(Main *main)
{
/* Replace all nodes with unknown types after versioning. */
Would be worth explaining why this has to happen so late in the readfile process.
@blender-bot build