From 8a98c6992f079706b6fe6d4d80302f80ce5692e3 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 9 Oct 2025 19:08:37 +0200 Subject: [PATCH] Fix: Run node link pointer repair again Run the versioning added in dbf777569b298c77b7a12d247245f58e43d5288e. Another file from #147694 has this issue. Pull Request: https://projects.blender.org/blender/blender/pulls/147737 --- source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/blenloader/intern/versioning_500.cc | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 28640e39d1f..999b4d2b641 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -27,7 +27,7 @@ /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 108 +#define BLENDER_FILE_SUBVERSION 109 /* Minimum Blender version that supports reading file written with the current * version. Older Blender versions will test this and cancel loading the file, showing a warning to diff --git a/source/blender/blenloader/intern/versioning_500.cc b/source/blender/blenloader/intern/versioning_500.cc index 108430b7645..ad5e3a815db 100644 --- a/source/blender/blenloader/intern/versioning_500.cc +++ b/source/blender/blenloader/intern/versioning_500.cc @@ -3600,12 +3600,6 @@ void blo_do_versions_500(FileData *fd, Library * /*lib*/, Main *bmain) } } - if (!MAIN_VERSION_FILE_ATLEAST(bmain, 500, 69)) { - LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) { - repair_node_link_node_pointers(*fd, *ntree); - } - } - if (!MAIN_VERSION_FILE_ATLEAST(bmain, 500, 71)) { LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { scene->toolsettings->uvsculpt.size *= 2; @@ -3978,6 +3972,12 @@ void blo_do_versions_500(FileData *fd, Library * /*lib*/, Main *bmain) } } + if (!MAIN_VERSION_FILE_ATLEAST(bmain, 500, 109)) { + LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) { + repair_node_link_node_pointers(*fd, *ntree); + } + } + /** * Always bump subversion in BKE_blender_version.h when adding versioning * code here, and wrap it inside a MAIN_VERSION_FILE_ATLEAST check.