diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-14 10:08:37 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-14 10:08:37 +0300 |
commit | d430d12123d88780480e1523340af7a0cddacf96 (patch) | |
tree | 2532976198a2e8d36ee388f94f3c8a273cb700ae /doc | |
parent | 7314904a777534fce6ec45cc410a8e2c8b0cf970 (diff) | |
parent | 8803c5ca5d8a99d97529ce2c170a268b52335997 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'doc')
-rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 75064f2c5ef..b0200c0f7d8 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -420,19 +420,28 @@ MODULE_GROUPING = { # -------------------------------BLENDER---------------------------------------- blender_version_strings = [str(v) for v in bpy.app.version] +is_release = bpy.app.version_cycle in {"rc", "release"} # converting bytes to strings, due to T30154 BLENDER_REVISION = str(bpy.app.build_hash, 'utf_8') BLENDER_DATE = str(bpy.app.build_date, 'utf_8') -BLENDER_VERSION_DOTS = ".".join(blender_version_strings) # '2.62.1' +if is_release: + # '2.62a' + BLENDER_VERSION_DOTS = ".".join(blender_version_strings[:2]) + bpy.app.version_char +else: + # '2.62.1' + BLENDER_VERSION_DOTS = ".".join(blender_version_strings) if BLENDER_REVISION != "Unknown": - BLENDER_VERSION_DOTS += " " + BLENDER_REVISION # '2.62.1 SHA1' + # '2.62a SHA1' (release) or '2.62.1 SHA1' (non-release) + BLENDER_VERSION_DOTS += " " + BLENDER_REVISION -BLENDER_VERSION_PATH = "_".join(blender_version_strings) # '2_62_1' -if bpy.app.version_cycle in {"rc", "release"}: +if is_release: # '2_62a_release' BLENDER_VERSION_PATH = "%s%s_release" % ("_".join(blender_version_strings[:2]), bpy.app.version_char) +else: + # '2_62_1' + BLENDER_VERSION_PATH = "_".join(blender_version_strings) # --------------------------DOWNLOADABLE FILES---------------------------------- |