blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Correct Blender version after last commit 

c08d847488 incremented the patch version instead of the file subversion
for versioning code when adding new options. This commit resets the patch
version and instead bumps the file subversion.
This commit is contained in:
Hans Goudey 2020-07-18 12:25:51 -04:00
parent c08d847488
commit b8601b64c7
Notes: blender-bot 2023-02-14 07:45:38 +01:00 
Referenced by issue #79095, Crash when entering edit mode on a mesh set to Viewport Display: Wire
Referenced by issue #79083, Crash: colorpicker crashes blender when the object has a multiresolution modifier
Referenced by issue #79084, Crash blender on startup
Referenced by issue #79066, Entering Edit Mode when Viewport Display set as Wire or Bounds leads to crash
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,13 +34,13 @@ extern "C" {
/* Blender major and minor version. */
#define BLENDER_VERSION 290
/* Blender patch version for bugfix releases. */
#define BLENDER_VERSION_PATCH 1
#define BLENDER_VERSION_PATCH 0
/** Blender release cycle stage: alpha/beta/rc/release. */
#define BLENDER_VERSION_CYCLE alpha
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 6
#define BLENDER_FILE_SUBVERSION 7
/* 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

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

@ -753,7 +753,7 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
userdef->transopts &= ~USER_DOTRANSLATE_DEPRECATED;
}
if (!USER_VERSION_ATLEAST(290, 1)) {
if (!USER_VERSION_ATLEAST(290, 7)) {
userdef->statusbar_flag = STATUSBAR_SHOW_VERSION;
}