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)
1  2 
source/blender/editors/physics/particle_edit_undo.c
source/blender/editors/physics/particle_object.c