Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-07-03 07:58:34 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-07-03 07:58:34 +0300
commit00fc1d70a70694973c53d4974ed21ef888532d0a (patch)
tree5c40fa7d2a915c764b244fbed591fae5b4072a74 /doc/python_api/sphinx_doc_gen.py
parente856eb7e8b65a7391c89b0938de49bb7d781f5dc (diff)
parent8c15d612a5cdfe39233c7f2b7556742091c82558 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'doc/python_api/sphinx_doc_gen.py')
-rw-r--r--doc/python_api/sphinx_doc_gen.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index b0200c0f7d8..bfa8a295f5b 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -73,6 +73,8 @@ def rna_info_BuildRNAInfo_cache():
if rna_info_BuildRNAInfo_cache.ret is None:
rna_info_BuildRNAInfo_cache.ret = rna_info.BuildRNAInfo()
return rna_info_BuildRNAInfo_cache.ret
+
+
rna_info_BuildRNAInfo_cache.ret = None
# --- end rna_info cache
@@ -434,7 +436,7 @@ else:
BLENDER_VERSION_DOTS = ".".join(blender_version_strings)
if BLENDER_REVISION != "Unknown":
# '2.62a SHA1' (release) or '2.62.1 SHA1' (non-release)
- BLENDER_VERSION_DOTS += " " + BLENDER_REVISION
+ BLENDER_VERSION_DOTS += " " + BLENDER_REVISION
if is_release:
# '2_62a_release'
@@ -516,6 +518,8 @@ def escape_rst(text):
""" Escape plain text which may contain characters used by RST.
"""
return text.translate(escape_rst.trans)
+
+
escape_rst.trans = str.maketrans({
"`": "\\`",
"|": "\\|",
@@ -1018,6 +1022,7 @@ def pymodule2sphinx(basepath, module_name, module, title):
file.close()
+
# Changes in Blender will force errors here
context_type_map = {
"active_base": ("ObjectBase", False),