diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-05 18:45:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-05 18:45:24 +0400 |
| commit | 05a78baa87f0cb92be53b736e5a0d3ddee349f21 (patch) | |
| tree | e91d1055cf25d9c9b885e81a76a13db09b33c99c | |
| parent | 3e949dd12f5c617e01764dee72ef7a24c4454252 (diff) | |
sphinx api docs: fix for addons linking to the wrong operator SVN url's.
also change from blender from 'release' back to beta so new docs don't overwrite the 2.57b release docs.
| -rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 13 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 258b28a3d33..03c8fe1b4ff 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -810,7 +810,9 @@ def pyrna2sphinx(BASEPATH): # operators def write_ops(): - API_BASEURL = "https://svn.blender.org/svnroot/bf-blender/trunk/blender/release/scripts" + API_BASEURL = "http://svn.blender.org/svnroot/bf-blender/trunk/blender/release/scripts" + API_BASEURL_ADDON = "http://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts" + API_BASEURL_ADDON_CONTRIB = "http://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts" op_modules = {} for op in ops.values(): @@ -849,7 +851,14 @@ def pyrna2sphinx(BASEPATH): location = op.get_location() if location != (None, None): - fw(" :file: `%s <%s/%s>`_:%d\n\n" % (location[0], API_BASEURL, location[0], location[1])) + if location[0].startswith("addons_contrib" + os.sep): + url_base = API_BASEURL_ADDON_CONTRIB + elif location[0].startswith("addons" + os.sep): + url_base = API_BASEURL_ADDON + else: + url_base = API_BASEURL + + fw(" :file: `%s <%s/%s>`_:%d\n\n" % (location[0], url_base, location[0], location[1])) file.close() diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 6c415010953..7e9f531162b 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -53,7 +53,7 @@ extern "C" { /* can be left blank, otherwise a,b,c... etc with no quotes */ #define BLENDER_VERSION_CHAR b /* alpha/beta/rc/release, docs use this */ -#define BLENDER_VERSION_CYCLE release +#define BLENDER_VERSION_CYCLE beta struct ListBase; struct MemFile; |