diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-05-29 19:05:04 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-05-29 19:05:04 +0300 |
| commit | c93a88413d1499d43265af9580e993bf8963726d (patch) | |
| tree | 3f2e7121d2c6cd62701c2d286e461874acc867b5 /release | |
| parent | 43853d0528a7a705f1022ad37b95e3b0d8927efd (diff) | |
| parent | a86b5df005d0c474de973215b112f404902b2607 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'release')
| -rw-r--r-- | release/datafiles/userdef/userdef_default.c | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c index aee532f1c2d..31d0eb8e923 100644 --- a/release/datafiles/userdef/userdef_default.c +++ b/release/datafiles/userdef/userdef_default.c @@ -31,8 +31,8 @@ #include "BLO_readfile.h" /* own include */ const UserDef U_default = { - .versionfile = BLENDER_VERSION, - .subversionfile = BLENDER_SUBVERSION, + .versionfile = BLENDER_FILE_VERSION, + .subversionfile = BLENDER_FILE_SUBVERSION, .flag = (USER_AUTOSAVE | USER_TOOLTIPS | USER_SAVE_PREVIEWS | USER_RELPATHS | USER_RELEASECONFIRM | USER_SCRIPT_AUTOEXEC_DISABLE | USER_NONEGFRAMES), .dupflag = USER_DUP_MESH | USER_DUP_CURVE | USER_DUP_SURF | USER_DUP_FONT | USER_DUP_MBALL | diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index b54ae67a9c5..633118c3b2e 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1106,8 +1106,8 @@ class WM_OT_doc_view(Operator): doc_id: doc_id if bpy.app.version_cycle in {"release", "rc", "beta"}: - _prefix = ("https://docs.blender.org/api/%d.%d%s" % - (bpy.app.version[0], bpy.app.version[1], bpy.app.version_char)) + _prefix = ("https://docs.blender.org/api/%d.%d" % + (bpy.app.version[0], bpy.app.version[1])) else: _prefix = ("https://docs.blender.org/api/master") |