Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 13 Aug 2018 09:58:24 +0000 (11:58 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 13 Aug 2018 09:58:24 +0000 (11:58 +0200)
commitd3250593d07857e4f73b31bbff54536fb306a245
treeaccbbf4e40ed3d42f2dd095888bae10f26e6e88d
parent4710af81a4003cf1c19f7fc16c08a53146bf3fba
parent844b40b0c174bbf5117b42427b0bc020a73bb60c
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/particle_child.c