diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-14 23:39:33 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-14 23:39:33 +0300 |
commit | 7439919ac0c4b0146cfed0ddbb8b945fe3675bcb (patch) | |
tree | 39730e1c17f939bd12e465ce597e2f24bbd91d34 /doc | |
parent | dbca1afefa700f25198761624cdb9f1fd21095d2 (diff) | |
parent | eeb9e5316a615f0e5052b28eee4966c4e2ed1152 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'doc')
-rw-r--r-- | doc/python_api/rst/bge.app.rst | 9 | ||||
-rw-r--r-- | doc/python_api/rst/include__bmesh.rst | 15 | ||||
-rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 2 |
3 files changed, 18 insertions, 8 deletions
diff --git a/doc/python_api/rst/bge.app.rst b/doc/python_api/rst/bge.app.rst index 34b9263db0c..326d9651a54 100644 --- a/doc/python_api/rst/bge.app.rst +++ b/doc/python_api/rst/bge.app.rst @@ -4,6 +4,15 @@ Application Data (bge.app) Module to access application values that remain unchanged during runtime. +Submodules: + +.. toctree:: + :maxdepth: 1 + + bpy.app.handlers.rst + bpy.app.translations.rst + + .. module:: bge.app .. data:: version diff --git a/doc/python_api/rst/include__bmesh.rst b/doc/python_api/rst/include__bmesh.rst index 83e3e73cea4..bed374bf7b6 100644 --- a/doc/python_api/rst/include__bmesh.rst +++ b/doc/python_api/rst/include__bmesh.rst @@ -7,14 +7,17 @@ Submodules: -* :mod:`bmesh.ops` -* :mod:`bmesh.types` -* :mod:`bmesh.utils` -* :mod:`bmesh.geometry` +.. toctree:: + :maxdepth: 1 + bmesh.ops.rst + bmesh.types.rst + bmesh.utils.rst + bmesh.geometry.rst -Intro ------ + +Introduction +------------ This API gives access the blenders internal mesh editing api, featuring geometry connectivity data and access to editing operations such as split, separate, collapse and dissolve. diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 0316b6cd23e..f9f6f1eb109 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -1717,8 +1717,6 @@ def write_rst_contents(basepath): "bpy.utils.previews", "bpy.path", "bpy.app", - "bpy.app.handlers", - "bpy.app.translations", # C modules "bpy.props", |