Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-11-19 04:41:11 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-11-19 04:41:11 +0400
commitb7cd9ec3ada529bf1d57cf08cc96851ceb67a47d (patch)
tree4ec25ec70b30c3e4a18b384e1938e3aec957d264 /doc
parent6cee7bb2b77bc7b577a3067c30dc56e22b4752ce (diff)
parenteb1fccd8a54c33a057fa3692eb3dfa1012f4fdfc (diff)
Merged changes in the trunk up to revision 52340.
Conflicts resolved: source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'doc')
-rw-r--r--doc/python_api/sphinx_doc_gen.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index a8e2275e1ae..782e0c6daaa 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1259,7 +1259,7 @@ def pyrna2sphinx(basepath):
bases = list(reversed(struct.get_bases()))
# props
- lines[:] = []
+ del lines[:]
if _BPY_STRUCT_FAKE:
descr_items = [(key, descr) for key, descr in sorted(bpy.types.Struct.__bases__[0].__dict__.items()) if not key.startswith("__")]
@@ -1290,7 +1290,7 @@ def pyrna2sphinx(basepath):
fw("\n")
# funcs
- lines[:] = []
+ del lines[:]
if _BPY_STRUCT_FAKE:
for key, descr in descr_items:
@@ -1313,7 +1313,7 @@ def pyrna2sphinx(basepath):
fw(line)
fw("\n")
- lines[:] = []
+ del lines[:]
if struct.references:
# use this otherwise it gets in the index for a normal heading.