From 86e30a29f1872001ea3f14ad5d85edddc7c785d8 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Wed, 4 Jun 2025 16:31:45 +0200 Subject: [PATCH] Versioning: Add 500 versioning file Pull Request: https://projects.blender.org/blender/blender/pulls/139830 --- source/blender/blenloader/CMakeLists.txt | 1 + source/blender/blenloader/intern/readfile.cc | 6 +++ source/blender/blenloader/intern/readfile.hh | 2 + .../blenloader/intern/versioning_500.cc | 42 +++++++++++++++++++ 4 files changed, 51 insertions(+) create mode 100644 source/blender/blenloader/intern/versioning_500.cc diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index d5412a1c27b..eee3b15d32e 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -34,6 +34,7 @@ set(SRC intern/versioning_430.cc intern/versioning_440.cc intern/versioning_450.cc + intern/versioning_500.cc intern/versioning_common.cc intern/versioning_defaults.cc intern/versioning_dna.cc diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index 14ac57d21d5..47a55163c03 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -3149,6 +3149,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main) if (!main->is_read_invalid) { blo_do_versions_450(fd, lib, main); } + if (!main->is_read_invalid) { + blo_do_versions_500(fd, lib, main); + } /* WATCH IT!!!: pointers from libdata have not been converted yet here! */ /* WATCH IT 2!: #UserDef struct init see #do_versions_userdef() above! */ @@ -3209,6 +3212,9 @@ static void do_versions_after_linking(FileData *fd, Main *main) if (!main->is_read_invalid) { do_versions_after_linking_450(fd, main); } + if (!main->is_read_invalid) { + do_versions_after_linking_500(fd, main); + } main->is_locked_for_linking = false; } diff --git a/source/blender/blenloader/intern/readfile.hh b/source/blender/blenloader/intern/readfile.hh index 8e9eef95d8a..12afcca3cf8 100644 --- a/source/blender/blenloader/intern/readfile.hh +++ b/source/blender/blenloader/intern/readfile.hh @@ -252,6 +252,7 @@ void blo_do_versions_420(FileData *fd, Library *lib, Main *bmain); void blo_do_versions_430(FileData *fd, Library *lib, Main *bmain); void blo_do_versions_440(FileData *fd, Library *lib, Main *bmain); void blo_do_versions_450(FileData *fd, Library *lib, Main *bmain); +void blo_do_versions_500(FileData *fd, Library *lib, Main *bmain); void do_versions_after_linking_250(Main *bmain); void do_versions_after_linking_260(Main *bmain); @@ -265,6 +266,7 @@ void do_versions_after_linking_420(FileData *fd, Main *bmain); void do_versions_after_linking_430(FileData *fd, Main *bmain); void do_versions_after_linking_440(FileData *fd, Main *bmain); void do_versions_after_linking_450(FileData *fd, Main *bmain); +void do_versions_after_linking_500(FileData *fd, Main *bmain); void do_versions_after_setup(Main *new_bmain, BlendfileLinkAppendContext *lapp_context, diff --git a/source/blender/blenloader/intern/versioning_500.cc b/source/blender/blenloader/intern/versioning_500.cc new file mode 100644 index 00000000000..9d057619e73 --- /dev/null +++ b/source/blender/blenloader/intern/versioning_500.cc @@ -0,0 +1,42 @@ +/* SPDX-FileCopyrightText: 2025 Blender Authors + * + * SPDX-License-Identifier: GPL-2.0-or-later */ + +/** \file + * \ingroup blenloader + */ + +#define DNA_DEPRECATED_ALLOW + +#include "DNA_ID.h" + +#include "BLI_sys_types.h" + +#include "BKE_main.hh" + +#include "readfile.hh" + +#include "versioning_common.hh" + +// #include "CLG_log.h" +// static CLG_LogRef LOG = {"blo.readfile.doversion"}; + +void do_versions_after_linking_500(FileData * /*fd*/, Main * /*bmain*/) +{ + /** + * Always bump subversion in BKE_blender_version.h when adding versioning + * code here, and wrap it inside a MAIN_VERSION_FILE_ATLEAST check. + * + * \note Keep this message at the bottom of the function. + */ +} + +void blo_do_versions_500(FileData * /*fd*/, Library * /*lib*/, Main * /*bmain*/) +{ + /** + * Always bump subversion in BKE_blender_version.h when adding versioning + * code here, and wrap it inside a MAIN_VERSION_FILE_ATLEAST check. + * + * \note Keep this message at the bottom of the function. + */ +}