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

Merged changes in the trunk up to revision 36092.

Browse Source 
Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
This commit is contained in:
Tamito Kajiyama
2011-04-11 00:09:56 +00:00
parent 09c7d5aeb8 e37dc17991
commit 3df52d4e19
235 changed files with 11588 additions and 10041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
doc/python_api/sphinx_doc_gen.py
View File

@@ -994,6 +994,15 @@ def rna2sphinx(BASEPATH):
fw(" bge.render.rst\n\n")
fw(" bge.events.rst\n\n")
# rna generated change log
fw("========\n")
fw("API Info\n")
fw("========\n")
fw("\n")
fw(".. toctree::\n")
fw(" :maxdepth: 1\n\n")
fw(" change_log.rst\n\n")
file.close()
# internal modules
@@ -1098,6 +1107,8 @@ def rna2sphinx(BASEPATH):
shutil.copy2(os.path.join(BASEPATH, "..", "rst", "bge.render.rst"), BASEPATH)
shutil.copy2(os.path.join(BASEPATH, "..", "rst", "bge.events.rst"), BASEPATH)
shutil.copy2(os.path.join(BASEPATH, "..", "rst", "change_log.rst"), BASEPATH)
if 0:
filepath = os.path.join(BASEPATH, "bpy.rst")
file = open(filepath, "w")