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)
commite183372f901d57795ce22d6c81cc231ec6739ec2
treeb0bfcebef2ba7288b7c3ea425550e7dea26c58c8
parent08e7b5d348cf2d2e82a6431aa8641fed7b479166
parent0c7fbc435f4611d6f25a58b17f7f65318bef572d
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/collision.c