Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
	source/blender/blenkernel/intern/collision.c
This commit is contained in:
Bastien Montagne
2018-09-03 17:44:36 +02:00
parent b46e987a70 265ec400ab
commit a43ebc63fa
73 changed files with 140 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
doc/python_api/sphinx_doc_gen.py
View File

@@ -461,7 +461,7 @@ if ARGS.sphinx_build_pdf:
# --------------------------------API DUMP--------------------------------------
# lame, python wont give some access
# lame, python won't give some access
ClassMethodDescriptorType = type(dict.__dict__['fromkeys'])
MethodDescriptorType = type(dict.get)
GetSetDescriptorType = type(int.real)
@@ -645,7 +645,7 @@ def pyfunc2sphinx(ident, fw, module_name, type_name, identifier, py_func, is_cla
if not is_class:
func_type = "function"
# ther rest are class methods
# the rest are class methods
elif arg_str.startswith("(self, ") or arg_str == "(self)":
arg_str = "()" if (arg_str == "(self)") else ("(" + arg_str[7:])
func_type = "method"
@@ -779,7 +779,7 @@ def pymodule2sphinx(basepath, module_name, module, title):
fw(".. module:: %s\n\n" % module_name)
if module.__doc__:
# Note, may contain sphinx syntax, dont mangle!
# Note, may contain sphinx syntax, don't mangle!
fw(module.__doc__.strip())
fw("\n\n")
@@ -1076,7 +1076,7 @@ def pycontext2sphinx(basepath):
def write_contex_cls():
fw(title_string("Global Context", "-"))
fw("These properties are avilable in any contexts.\n\n")
fw("These properties are available in any contexts.\n\n")
# very silly. could make these global and only access once.
# structs, funcs, ops, props = rna_info.BuildRNAInfo()
@@ -1100,7 +1100,7 @@ def pycontext2sphinx(basepath):
if prop.description:
fw(" %s\n\n" % prop.description)
# special exception, cant use genric code here for enums
# special exception, can't use generic code here for enums
if prop.type == "enum":
enum_text = pyrna_enum2sphinx(prop)
if enum_text:
@@ -1222,7 +1222,7 @@ def pyrna2sphinx(basepath):
if prop.name or prop.description:
fw(ident + " " + ", ".join(val for val in (prop.name, prop.description) if val) + "\n\n")
# special exception, cant use genric code here for enums
# special exception, can't use generic code here for enums
if enum_text:
write_indented_lines(ident + " ", fw, enum_text)
fw("\n")
@@ -1321,7 +1321,7 @@ def pyrna2sphinx(basepath):
if prop.description:
fw(" %s\n\n" % prop.description)
# special exception, cant use genric code here for enums
# special exception, can't use generic code here for enums
if prop.type == "enum":
enum_text = pyrna_enum2sphinx(prop)
if enum_text:
@@ -1354,7 +1354,7 @@ def pyrna2sphinx(basepath):
elif func.return_values: # multiple return values
fw(" :return (%s):\n" % ", ".join(prop.identifier for prop in func.return_values))
for prop in func.return_values:
# TODO, pyrna_enum2sphinx for multiple return values... actually dont
# TODO, pyrna_enum2sphinx for multiple return values... actually don't
# think we even use this but still!!!
type_descr = prop.get_type_description(
as_ret=True, class_fmt=":class:`%s`", collection_id=_BPY_PROP_COLLECTION_ID)