Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 28 Nov 2017 15:34:43 +0000 (16:34 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 28 Nov 2017 15:34:43 +0000 (16:34 +0100)
1  2 
source/blender/blenkernel/intern/collision.c