Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jun 2018 15:58:07 +0000 (17:58 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jun 2018 15:58:07 +0000 (17:58 +0200)
commit84becb870f8e0785bdfca0f381c7b06f415e4e6a
treece3938c0947b73a8517b8c694058e11b75b790b3
parent2b4d2de2537ef1c7cfc66c261067d477f5f94edc
parent747534af0058ff7a719b99af68333753527ed747
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/particle_system.c
source/blender/makesrna/intern/rna_particle.c