Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 25 Jul 2018 19:12:04 +0000 (21:12 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 25 Jul 2018 19:12:04 +0000 (21:12 +0200)
commit9c0dea213ed55b7a66d454bf16de8a7d6855a596
tree6891cae09e61eb6f6d6c57eed85aa51722b3f6bb
parent8c9e6c59863077512e7abfa4fdedbbedfd954a87
parent29d1db9ed6253f68c5452be1f0125ed364d4a954
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/intern/rigidbody.c
release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenlib/intern/math_geom.c
source/blender/makesdna/DNA_rigidbody_types.h
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_rigidbody.c