archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 41225.

Browse Source 
Conflicts resolved:
source/blender/render/intern/source/pipeline.c
This commit is contained in:
Tamito Kajiyama
2011-10-29 15:46:14 +00:00
parent f0ca79bccb f1cea89d99
commit 16702c1729
340 changed files with 8196 additions and 7706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/python_api/sphinx_doc_gen.py
View File

@@ -27,7 +27,7 @@ For HTML generation
-------------------
- Run this script from blenders root path once you have compiled blender
./blender.bin --background --python doc/python_api/sphinx_doc_gen.py
./blender.bin --background -noaudio --python doc/python_api/sphinx_doc_gen.py
This will generate python files in doc/python_api/sphinx-in/
providing ./blender.bin is or links to the blender executable
@@ -95,7 +95,7 @@ else:
# for quick rebuilds
"""
rm -rf /b/doc/python_api/sphinx-* && \
./blender.bin --background --factory-startup --python doc/python_api/sphinx_doc_gen.py && \
./blender.bin --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py && \
sphinx-build doc/python_api/sphinx-in doc/python_api/sphinx-out
"""