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

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

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

..

freestyle

Spelling fixes in comments and descriptions, patch by luzpaz.

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

parameter_editor.py

…