Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 3 Sep 2018 13:33:07 +0000 (15:33 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 3 Sep 2018 13:33:07 +0000 (15:33 +0200)
commit30a2ad8efedb8513098682a860ebb8b1a54a1eca
treec711dc58d6f0e9ccee375053acdf5abc85fd1e9a
parent3dee8b4a12f068f3837946a0c2222459385305d3
parentc6bbe6c5aac29a4d36eb3aedd488ca4deac68fb7
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/collision.c