Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 7 Aug 2017 19:09:10 +0000 (21:09 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 7 Aug 2017 19:09:10 +0000 (21:09 +0200)
commitcf8add42b807449e6f96f8ecab637d52e166052f
treec6fe3713ea8a1b85eb986dcfb08546772166202e
parente673c9dc938844d158abe543457aca8016ef8bc1
parenta4bbce894914837c65f06f466f40e0cc1db7acb9
Merge branch 'master' into blender2.8

Stupid git handles merges terribly when there are conflicts and branch
is modified buring merge process... :((((
source/blender/blenkernel/intern/rigidbody.c
source/blender/makesdna/DNA_ID.h