archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 36551.

Browse Source 
Conflicts resolved:
source/creator/SConscript
This commit is contained in:
Tamito Kajiyama
2011-05-09 01:38:29 +00:00
parent b1db37dd05 f8f4f73cc5
commit 31471f644c
304 changed files with 18138 additions and 17419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
doc/python_api/sphinx_doc_gen.py
View File

@@ -818,7 +818,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():
@@ -857,7 +859,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()