Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2018 00:17:35 +0000 (10:17 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2018 00:17:35 +0000 (10:17 +1000)
commit3036a9a46c18758bfae90163e14e3b5d38c2680a
treeeba0bfccd53d7526b685019cdd4a1c84df93c011
parent5e8dbafb5b211f9a2c7de5580a7e83254706521b
parentc29c426925311eeb79e3988609e914e72b61013b
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/physics/particle_edit.c