diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-06-24 09:56:00 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-24 10:01:25 +0300 |
commit | 3c7355b3a2190f028904d9bc8ef8f1bb4730a238 (patch) | |
tree | 4feeaed086136cae03699b28aacd70b0dbbaf02b | |
parent | 838a4622cf7a01f302b4decfd74c4b8a17d7b509 (diff) |
Revert "Fix py-api doc building"
This reverts commit 838a4622cf7a01f302b4decfd74c4b8a17d7b509.
Also add missing 'lightprobe'
-rw-r--r-- | GNUmakefile | 2 | ||||
-rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index 7ee011911f8..b4dd828577f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -411,7 +411,7 @@ update: .FORCE # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation. doc_py: .FORCE - "$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup \ + "/src/blender/blender.bin" --background -noaudio --factory-startup \ --python doc/python_api/sphinx_doc_gen.py cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out @echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'" diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 3b0e8f52c83..a6ae89ffd6a 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -1024,6 +1024,7 @@ context_type_map = { "brush": ("Brush", False), "camera": ("Camera", False), "cloth": ("ClothModifier", False), + "collection": ("LayerCollection", False), "collision": ("CollisionModifier", False), "curve": ("Curve", False), "dynamic_paint": ("DynamicPaintModifier", False), @@ -1044,6 +1045,7 @@ context_type_map = { "image_paint_object": ("Object", False), "lamp": ("Lamp", False), "lattice": ("Lattice", False), + "lightprobe": ("LightProbe", False), "line_style": ("FreestyleLineStyle", False), "material": ("Material", False), "material_slot": ("MaterialSlot", False), @@ -1055,6 +1057,7 @@ context_type_map = { "particle_system": ("ParticleSystem", False), "particle_system_editable": ("ParticleSystem", False), "pose_bone": ("PoseBone", False), + "render_layer": ("SceneLayer", False), "scene": ("Scene", False), "sculpt_object": ("Object", False), "selectable_bases": ("ObjectBase", True), |