Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2018 00:45:00 +0000 (10:45 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2018 00:45:00 +0000 (10:45 +1000)
commit1bbddc8a1ed86ff94657e1e1acb34977a4c3a565
treef847f9c20bb05007d7d8f9320895cfccbd861189
parent3036a9a46c18758bfae90163e14e3b5d38c2680a
parentb993e8a17a077ae23b909a9da425e72e1b16bf1a
Merge branch 'master' into blender2.8
source/blender/editors/include/ED_particle.h
source/blender/editors/physics/particle_edit.c