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

6
doc/python_api/rst_from_bmesh_opdefines.py
View File

@@ -346,7 +346,7 @@ def main():
elif tp_sub == BMO_OP_SLOT_SUBTYPE_PTR_MESH:
tp_str = ":class:`bpy.types.Mesh`"
else:
print("Cant find", vars_dict_reverse[tp_sub])
print("Can't find", vars_dict_reverse[tp_sub])
assert(0)
elif tp == BMO_OP_SLOT_ELEMENT_BUF:
@@ -383,10 +383,10 @@ def main():
elif tp_sub == BMO_OP_SLOT_SUBTYPE_MAP_INTERNAL:
tp_str += "unknown internal data, not compatible with python"
else:
print("Cant find", vars_dict_reverse[tp_sub])
print("Can't find", vars_dict_reverse[tp_sub])
assert(0)
else:
print("Cant find", vars_dict_reverse[tp])
print("Can't find", vars_dict_reverse[tp])
assert(0)
args_wash.append((name, tp_str, comment))