Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Fri, 7 Dec 2018 15:42:36 +0000 (16:42 +0100)
committerPhilipp Oeser <info@graphics-engineer.com>
Fri, 7 Dec 2018 15:42:36 +0000 (16:42 +0100)
commit16e67dc206d4dec9aa6f39eec1609b1866654eab
tree674ac71440a87003936fe6c5e13ad24be1c79e94
parentf034926dbac36de826b023cb0adeed447384414e
parent0eb61c799d0e98ccb92b12aea744c79a9da7e7c2
Merge branch 'master' into blender2.8
source/blender/modifiers/intern/MOD_particleinstance.c