Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2018 00:02:43 +0000 (10:02 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2018 00:08:34 +0000 (10:08 +1000)
commit5e8dbafb5b211f9a2c7de5580a7e83254706521b
tree3d24a17ec7508ce349f0dcd26ee476835c2f7a17
parentefdc0959b17fba969b25bcbf7318322a01d791d0
parent98f4a8eedf218c240adbac586fed02cfe51e01a9
Merge branch 'master' into blender2.8
source/blender/editors/physics/particle_boids.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/physics/particle_edit_undo.c
source/blender/editors/physics/particle_object.c