Merge branch 'master' into blender2.8

2018-09-13 15:39:21 +10:00
parent c2fb0bacb8 ffe5b92325
commit a4e4dc1b75
2 changed files with 5 additions and 1 deletions
--- a/doc/python_api/sphinx_doc_gen.sh
+++ b/doc/python_api/sphinx_doc_gen.sh
@@ -58,7 +58,10 @@ SPHINX_WORKDIR="$(mktemp --directory --suffix=.sphinx)"
 # Generate reStructuredText (blender/python only)

 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 \
 		--background \
 		-noaudio \