diff options
author | Aaron Carlisle <carlisle.b3d@gmail.com> | 2022-11-04 06:41:11 +0300 |
---|---|---|
committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2022-11-04 06:41:11 +0300 |
commit | ecda9483f1f8a0aa6f05bd194e72a06889d27642 (patch) | |
tree | eb03a07e59ebee2b2d4cd7374e0a7213a2407451 | |
parent | e36db7018d21af73402492dca18c23b2dcc14a31 (diff) | |
parent | eb8155ebcde28fe924dfae464a1b09bd3d16edfd (diff) |
Merge branch 'blender-v3.4-release'
-rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 6 |
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 7b5f13177ef..f51ab8d6591 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -1459,15 +1459,15 @@ def pyrna2sphinx(basepath): # If the link has been written, no need to inline the enum items. enum_text = "" if enum_descr_override else pyrna_enum2sphinx(prop) if prop.name or prop.description or enum_text: - fw(ident + ":%s%s:\n\n" % (id_name, identifier)) + fw(ident + ":%s%s: " % (id_name, identifier)) if prop.name or prop.description: - fw(indent(", ".join(val for val in (prop.name, prop.description) if val), ident + " ") + "\n\n") + fw(", ".join(val for val in (prop.name, prop.description.replace("\n", "")) if val) + "\n") # Special exception, can't use generic code here for enums. if enum_text: - write_indented_lines(ident + " ", fw, enum_text) fw("\n") + write_indented_lines(ident + " ", fw, enum_text) del enum_text # end enum exception |