Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 19 Mar 2018 17:18:49 +0000 (18:18 +0100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 19 Mar 2018 17:18:49 +0000 (18:18 +0100)
commit402486ea7bc52f669bc02a00c5e2703590361409
treee2afafaad63fd32c410b30d8874eff0361832295
parent5e81d993afadc6b5d37410e91998395caf1d1281
parentb8eca8e07d4e0c2061464b485f4c2e1e5d23d8cc
Merge branch 'master' into blender2.8
source/blender/editors/physics/particle_edit_undo.c
source/blender/editors/physics/particle_object.c