forked from bartvdbraak/blender
Merge branch 'master' into blender2.8
This commit is contained in:
commit
a4e4dc1b75
@ -462,6 +462,7 @@ update: .FORCE
|
|||||||
|
|
||||||
# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
|
# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
|
||||||
doc_py: .FORCE
|
doc_py: .FORCE
|
||||||
|
ASAN_OPTIONS=halt_on_error=0 \
|
||||||
$(BLENDER_BIN) --background -noaudio --factory-startup \
|
$(BLENDER_BIN) --background -noaudio --factory-startup \
|
||||||
--python doc/python_api/sphinx_doc_gen.py
|
--python doc/python_api/sphinx_doc_gen.py
|
||||||
cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
|
cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
|
||||||
|
@ -58,7 +58,10 @@ SPHINX_WORKDIR="$(mktemp --directory --suffix=.sphinx)"
|
|||||||
# Generate reStructuredText (blender/python only)
|
# Generate reStructuredText (blender/python only)
|
||||||
|
|
||||||
if $DO_EXE_BLENDER ; then
|
if $DO_EXE_BLENDER ; then
|
||||||
# don't delete existing docs, now partial updates are used for quick builds.
|
# Don't delete existing docs, now partial updates are used for quick builds.
|
||||||
|
#
|
||||||
|
# Disable ASAN error halt since it results in nonzero exit code on any minor issue.
|
||||||
|
ASAN_OPTIONS=halt_on_error=0 \
|
||||||
$BLENDER_BIN \
|
$BLENDER_BIN \
|
||||||
--background \
|
--background \
|
||||||
-noaudio \
|
-noaudio \
|
||||||
|
Loading…
Reference in New Issue
Block a user