Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 13 Jun 2018 16:25:23 +0000 (18:25 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 13 Jun 2018 16:25:23 +0000 (18:25 +0200)
1  2 
source/blender/editors/physics/particle_edit.c