Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 4 Jul 2017 11:13:49 +0000 (13:13 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 4 Jul 2017 11:13:49 +0000 (13:13 +0200)
commitf23ed929ee021e11e8d47973d25f9039e9f91c17
tree32cd0f2a4dbb59a639a9523a72e0211fb69bd98b
parentfc8f6e8f7a3fcc3b17ee7db6291fb9dcb71dc185
parentf86b43e130cb0a1d5a460cc72bcd979c479215bc
Merge branch 'master' into blender2.8

Conflicts:
source/blender/makesdna/DNA_particle_types.h
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_particle_types.h