diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-13 08:39:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-13 08:39:21 +0300 |
commit | a4e4dc1b752145229e08c2a314c9d911861e8968 (patch) | |
tree | 59d42d15b5822b33c349b4ab6249822ccf0d114c /GNUmakefile | |
parent | c2fb0bacb87e327821daac6d1bce82660e8ef2d9 (diff) | |
parent | ffe5b92325a2a75d691adfacac9b8259e5e6d577 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/GNUmakefile b/GNUmakefile index 4b90e07cda6..f43da278f7e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -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 |