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 +20 -12
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e2030fbc33 - Show all commits

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

@ -19,7 +19,7 @@ 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 0 #define BLENDER_VERSION_PATCH 1
/** 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

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

@ -4148,16 +4148,7 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain)
} }
} }
/** if (!MAIN_VERSION_ATLEAST(bmain, 306, 1)) {
* Versioning code until next subversion bump goes here.
*
* \note Be sure to check when bumping the version:
* - "versioning_userdef.c", #blo_do_versions_userdef
* - "versioning_userdef.c", #do_versions_theme
*
* \note Keep this message at the bottom of the function.
*/
{
/* 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) {
@ -4180,11 +4171,24 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain)
SEQ_for_each_callback(&ed->seqbase, version_set_seq_single_frame_content, nullptr); SEQ_for_each_callback(&ed->seqbase, version_set_seq_single_frame_content, nullptr);
} }
} }
/* Keep this block, even when empty. */
LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) { LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) {
if (ntree->type == NTREE_GEOMETRY) { if (ntree->type == NTREE_GEOMETRY) {
version_geometry_nodes_extrude_smooth_propagation(*ntree); version_geometry_nodes_extrude_smooth_propagation(*ntree);
} }
} }
} }
/**
* Versioning code until next subversion bump goes here.
*
* \note Be sure to check when bumping the version:
* - "versioning_userdef.c", #blo_do_versions_userdef
* - "versioning_userdef.c", #do_versions_theme
*
* \note Keep this message at the bottom of the function.
*/
{
/* Keep this block, even when empty. */
}
} }

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

@ -89,6 +89,10 @@ 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)) {
FROM_DEFAULT_V4_UCHAR(space_view3d.face_retopology);
}
/** /**
* Versioning code until next subversion bump goes here. * Versioning code until next subversion bump goes here.
* *