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)
1  2 
source/blender/blenkernel/intern/particle.c
source/blender/blenloader/intern/versioning_270.c
source/blender/makesrna/intern/rna_particle.c