Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 2 Jun 2018 11:09:12 +0000 (13:09 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 2 Jun 2018 11:09:12 +0000 (13:09 +0200)
commita08a8aa92895fbf12899b2f19508fcd9cb752277
treee35f56dd0e96bf367d80b040fb291f515b7d4086
parentbb8770b97648fc655b5de0aacb6ea6f816e9e26c
parentc140f11946fd920230096950e4a1f18269f1b22e
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/particle_system.c