diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
| commit | a43ebc63fafeb3b945529117a2efacc80399d272 (patch) | |
| tree | d8ab3e90e50177874f2423b3bc1486548dccd7dd /doc/python_api/sphinx_doc_gen.sh | |
| parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
| parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'doc/python_api/sphinx_doc_gen.sh')
| -rwxr-xr-x | doc/python_api/sphinx_doc_gen.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/python_api/sphinx_doc_gen.sh b/doc/python_api/sphinx_doc_gen.sh index 0c1f531ffac..598b133af80 100755 --- a/doc/python_api/sphinx_doc_gen.sh +++ b/doc/python_api/sphinx_doc_gen.sh @@ -58,7 +58,7 @@ SPHINX_WORKDIR="$(mktemp --directory --suffix=.sphinx)" # Generate reStructuredText (blender/python only) if $DO_EXE_BLENDER ; then - # dont delete existing docs, now partial updates are used for quick builds. + # don't delete existing docs, now partial updates are used for quick builds. $BLENDER_BIN \ --background \ -noaudio \ @@ -89,7 +89,7 @@ if $DO_OUT_HTML ; then # and zip up there, for now this is OK rm -rf sphinx-out/.doctrees - # incase we have a zip already + # in case we have a zip already rm -f blender_python_reference_$BLENDER_VERSION.zip # ------------------------------------------------------------------------ |