diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-21 01:22:15 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-21 01:22:15 +0400 |
| commit | 9c42afb1c02cafa21632bd2e19b47c012a230368 (patch) | |
| tree | 90d7e190e9ba59437f1e3e31337984a2200aa764 /doc | |
| parent | 5582d9fac13123397297db54a0478a63a1b75194 (diff) | |
| parent | 8f5112f191e24aac86da7b70f461a50825e764da (diff) | |
Merged changes in the trunk up to revision 40413.
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 4e17fcd8dda..b2ed52eaf84 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -773,7 +773,7 @@ def pyrna2sphinx(BASEPATH): fw(" .. attribute:: %s\n\n" % prop.identifier) if prop.description: fw(" %s\n\n" % prop.description) - + # special exception, cant use genric code here for enums if prop.type == "enum": enum_text = pyrna_enum2sphinx(prop) @@ -1044,8 +1044,12 @@ def rna2sphinx(BASEPATH): fw("copyright = u'Blender Foundation'\n") fw("version = '%s - API'\n" % version_string) fw("release = '%s - API'\n" % version_string) - fw("html_theme = 'blender-org'\n") - fw("html_theme_path = ['../']\n") + + # until we get a theme for 'Naiad' + if 0: + fw("html_theme = 'blender-org'\n") + fw("html_theme_path = ['../']\n") + fw("html_favicon = 'favicon.ico'\n") # not helpful since the source us generated, adds to upload size. fw("html_copy_source = False\n") |