Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Wed, 9 May 2018 12:37:25 +0000 (14:37 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Wed, 9 May 2018 12:37:25 +0000 (14:37 +0200)
1  2 
source/blender/editors/physics/particle_edit.c