Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +4 -4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a26203bb3e - Show all commits

4
source/blender/blenkernel/BKE_blender_version.h
View File

@ -19,13 +19,13 @@ extern "C" {
/* Blender major and minor version. */ /* Blender major and minor version. */
#define BLENDER_VERSION 306 #define BLENDER_VERSION 306
/* Blender patch version for bugfix releases. */ /* Blender patch version for bugfix releases. */
#define BLENDER_VERSION_PATCH 1 #define BLENDER_VERSION_PATCH 0
/** Blender release cycle stage: alpha/beta/rc/release. */ /** Blender release cycle stage: alpha/beta/rc/release. */
#define BLENDER_VERSION_CYCLE alpha #define BLENDER_VERSION_CYCLE alpha
/* Blender file format version. */ /* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION #define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 2 #define BLENDER_FILE_SUBVERSION 3
/* Minimum Blender version that supports reading file written with the current /* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and show a warning if the file * version. Older Blender versions will test this and show a warning if the file

2
source/blender/blenloader/intern/versioning_300.cc
View File

@ -4148,7 +4148,7 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain)
} }
} }
if (!MAIN_VERSION_ATLEAST(bmain, 306, 1)) { if (!MAIN_VERSION_ATLEAST(bmain, 306, 3)) {
/* Z bias for retopology overlay. */ /* Z bias for retopology overlay. */
if (!DNA_struct_elem_find(fd->filesdna, "View3DOverlay", "float", "retopology_offset")) { if (!DNA_struct_elem_find(fd->filesdna, "View3DOverlay", "float", "retopology_offset")) {
LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {

2
source/blender/blenloader/intern/versioning_userdef.c
View File

@ -89,7 +89,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
btheme->tui.wcol_view_item = U_theme_default.tui.wcol_view_item; btheme->tui.wcol_view_item = U_theme_default.tui.wcol_view_item;
} }
if (!USER_VERSION_ATLEAST(306, 1)) { if (!USER_VERSION_ATLEAST(306, 3)) {
FROM_DEFAULT_V4_UCHAR(space_view3d.face_retopology); FROM_DEFAULT_V4_UCHAR(space_view3d.face_retopology);
} }