Merge branch 'blender-v5.0-release'

This commit is contained in:
Hans Goudey
2025-10-09 13:09:43 -04:00

View File

@@ -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.