diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index 3a39b5a7695..7d7f35e2c47 100644 --- a/doc/doxygen/Doxyfile +++ b/doc/doxygen/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = Blender # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = V5.0 +PROJECT_NUMBER = V5.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 2ed1c4f8f17..4f02e2dfc60 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -17,7 +17,7 @@ */ /** Blender major and minor version. */ -#define BLENDER_VERSION 500 +#define BLENDER_VERSION 501 /** Blender patch version for bug-fix releases. */ #define BLENDER_VERSION_PATCH 0 /** Blender release cycle stage: alpha/beta/rc/release. */ @@ -27,7 +27,7 @@ /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 106 +#define BLENDER_FILE_SUBVERSION 0 /* 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/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index 4942215bd56..fff16f00f5d 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -35,6 +35,7 @@ set(SRC intern/versioning_440.cc intern/versioning_450.cc intern/versioning_500.cc + intern/versioning_510.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 3eddb76988c..bf291ac0e43 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -3526,6 +3526,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main) if (!main->is_read_invalid) { blo_do_versions_500(fd, lib, main); } + if (!main->is_read_invalid) { + blo_do_versions_510(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! */ @@ -3588,6 +3591,9 @@ static void do_versions_after_linking(FileData *fd, Main *main) if (!main->is_read_invalid) { do_versions_after_linking_500(fd, main); } + if (!main->is_read_invalid) { + do_versions_after_linking_510(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 dad2889cf68..79c274fa558 100644 --- a/source/blender/blenloader/intern/readfile.hh +++ b/source/blender/blenloader/intern/readfile.hh @@ -311,6 +311,7 @@ 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 blo_do_versions_510(FileData *fd, Library *lib, Main *bmain); void do_versions_after_linking_250(Main *bmain); void do_versions_after_linking_260(Main *bmain); @@ -325,6 +326,7 @@ 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_linking_510(FileData *fd, Main *bmain); void do_versions_after_setup(Main *new_bmain, BlendfileLinkAppendContext *lapp_context, diff --git a/source/blender/blenloader/intern/versioning_510.cc b/source/blender/blenloader/intern/versioning_510.cc new file mode 100644 index 00000000000..ee02c61cee7 --- /dev/null +++ b/source/blender/blenloader/intern/versioning_510.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 = {"blend.doversion"}; + +void do_versions_after_linking_510(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_510(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. + */ +} diff --git a/source/blender/blenloader/intern/versioning_xxx_template.cc b/source/blender/blenloader/intern/versioning_xxx_template.cc index 32537a965aa..6a46edf4f01 100644 --- a/source/blender/blenloader/intern/versioning_xxx_template.cc +++ b/source/blender/blenloader/intern/versioning_xxx_template.cc @@ -13,10 +13,10 @@ * * When initializing a new version of Blender in main, after branching out the current one into * its release branch: - * - Copy that file and rename it to the proper new version number (e.g. `versioning_501.cc`). + * - Copy that file and rename it to the proper new version number (e.g. `versioning_510.cc`). * - Rename the two functions below by replacing the `xxx` with the matching new version number. * - Add the new file to CMakeList.txt - * - Add matching calls in #do_versions_after_linking and #do_versions, in `readfile.cc`. + * - Add matching calls in #do_versions_after_linking and #do_versions, in `readfile.cc` and update declarations in`readfile.hh`. */ #define DNA_DEPRECATED_ALLOW