Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Wed, 5 Jul 2017 20:25:05 +0000 (22:25 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Wed, 5 Jul 2017 20:25:05 +0000 (22:25 +0200)
commitcb554981594cd734f877a2ff78daec6622ecee83
treee97a54862316713c257fccfc404e91268d39e003
parent91808a67e8d5c0b16fb7580a6cab771f0e2d9a0d
parentaea44561017ccfba58bd97741dde1508aa826a44
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/particle.c
source/blender/blenloader/intern/versioning_270.c
source/blender/makesrna/intern/rna_particle.c