Merge branch 'master' into blender2.8

2017-06-19 15:06:48 +10:00
parent cf7447dacb 72c9141a7a
commit 9649c6bef5
27 changed files with 144 additions and 173 deletions
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1615,10 +1615,8 @@ def pyrna2sphinx(basepath):
                    else:
                        url_base = API_BASEURL

-                    fw("   :file: `%s <%s/%s>`_:%d\n\n" % (location[0],
-                                                           url_base,
-                                                           location[0],
-                                                           location[1]))
+                    fw("   :file: `%s\\:%d <%s/%s$%d>`_\n\n" %
+                       (location[0], location[1], url_base, location[0], location[1]))

            file.close()