Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton
2018-09-13 15:39:21 +10:00
2 changed files with 5 additions and 1 deletions

View File

@@ -462,6 +462,7 @@ update: .FORCE
# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
doc_py: .FORCE
ASAN_OPTIONS=halt_on_error=0 \
$(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