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

Merged changes in the trunk up to revision 44419.

Browse Source 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/creator/CMakeLists.txt
This commit is contained in:
Tamito Kajiyama
2012-02-25 01:26:45 +00:00
parent 9f243d531c 2d8227f204
commit 9ca7f6659f
403 changed files with 12005 additions and 8570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
doc/python_api/sphinx_doc_gen.py
View File

@@ -66,12 +66,12 @@ if 1:
FILTER_BPY_OPS = None
else:
EXCLUDE_INFO_DOCS = False
EXCLUDE_INFO_DOCS = True
# for testing so doc-builds dont take so long.
EXCLUDE_MODULES = (
"bpy.context",
#"bpy.app",
#"bpy.app.handlers",
"bpy.app",
"bpy.app.handlers",
"bpy.path",
"bpy.data",
"bpy.props",
@@ -88,6 +88,9 @@ else:
"mathutils",
"mathutils.geometry",
"mathutils.noise",
#"bmesh",
#"bmesh.types",
#"bmesh.utils",
"Freestyle",
)
@@ -1197,12 +1200,14 @@ def rna2sphinx(BASEPATH):
fw(".. toctree::\n")
fw(" :maxdepth: 1\n\n")
# mathutils
if "mathutils" not in EXCLUDE_MODULES:
fw(" mathutils.rst\n\n")
if "mathutils.geometry" not in EXCLUDE_MODULES:
fw(" mathutils.geometry.rst\n\n")
if "mathutils.noise" not in EXCLUDE_MODULES:
fw(" mathutils.noise.rst\n\n")
# misc
if "Freestyle" not in EXCLUDE_MODULES:
fw(" Freestyle.rst\n\n")
if "bgl" not in EXCLUDE_MODULES:
@@ -1215,6 +1220,13 @@ def rna2sphinx(BASEPATH):
fw(" aud.rst\n\n")
if "bpy_extras" not in EXCLUDE_MODULES:
fw(" bpy_extras.rst\n\n")
# bmesh
if "bmesh" not in EXCLUDE_MODULES:
fw(" bmesh.rst\n\n")
if "bmesh.types" not in EXCLUDE_MODULES:
fw(" bmesh.types.rst\n\n")
if "bmesh.utils" not in EXCLUDE_MODULES:
fw(" bmesh.utils.rst\n\n")
# game engine
if "bge" not in EXCLUDE_MODULES:
@@ -1348,6 +1360,18 @@ def rna2sphinx(BASEPATH):
import mathutils.noise as module
pymodule2sphinx(BASEPATH, "mathutils.noise", module, "Noise Utilities")
if "bmesh" not in EXCLUDE_MODULES:
import bmesh as module
pymodule2sphinx(BASEPATH, "bmesh", module, "BMesh Module")
if "bmesh.types" not in EXCLUDE_MODULES:
import bmesh.types as module
pymodule2sphinx(BASEPATH, "bmesh.types", module, "BMesh Types")
if "bmesh.utils" not in EXCLUDE_MODULES:
import bmesh.utils as module
pymodule2sphinx(BASEPATH, "bmesh.utils", module, "BMesh Utilities")
if "Freestyle" not in EXCLUDE_MODULES:
import Freestyle as module
pymodule2sphinx(BASEPATH, "Freestyle", module, "Freestyle Data Types & Operators")