Bastien Montagne a43ebc63fa Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/collision.c

2018-09-03 17:44:36 +02:00

..

bmesh_py_api.c

…

bmesh_py_api.h

…

bmesh_py_geometry.c

…

bmesh_py_geometry.h

…

bmesh_py_ops_call.c

Merge branch 'master' into blender2.8

2018-09-03 17:44:36 +02:00

bmesh_py_ops_call.h

…

bmesh_py_ops.c

Cleanup: indentation

2018-08-28 11:01:29 +10:00

bmesh_py_ops.h

…

bmesh_py_types_customdata.c

Merge branch 'master' into blender2.8

2018-06-17 11:57:49 +02:00

bmesh_py_types_customdata.h

…

bmesh_py_types_meshdata.c

Merge branch 'master' into blender2.8

2018-09-03 17:44:36 +02:00

bmesh_py_types_meshdata.h

…

bmesh_py_types_select.c

Fix T54927: BMesh Py error w/ select history slice

2018-05-03 20:23:32 +02:00

bmesh_py_types_select.h

…

bmesh_py_types.c

Merge branch 'master' into blender2.8

2018-09-03 17:44:36 +02:00

bmesh_py_types.h

…

bmesh_py_utils.c

Spelling fixes in comments and descriptions, patch by luzpaz.

2018-09-03 16:55:01 +02:00

bmesh_py_utils.h

…

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-06-04 09:06:14 +02:00