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)
commita3c630aebb34e88de3a4820a0bb0f4359e13570d
tree2f47b259fb066f949301b644ba4c648fd79e5a36
parent2e23385c35727a78417d0ea5f1aec47320268436
parent57cd52a4abbad02b314d8dabf7c77d96e9dcfe74
Merge branch 'master' into blender2.8
source/blender/editors/physics/particle_edit.c