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

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

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

..

modules

Merge branch 'master' into blender2.8

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

styles

Cleanup: trailing space

2017-07-25 01:28:15 +10:00