Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Fri, 4 May 2018 08:31:16 +0000 (10:31 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Fri, 4 May 2018 08:32:35 +0000 (10:32 +0200)
commit52aa1f3c6c1c5b8a12db5165da1a29e5b7b04c0f
tree2253de3179d0cec46c9aa6feb3c81e2b10a0071e
parentbf52d20e62798579b490581adcfa8ea4d4082993
parent288d7794d4c6836e1322d5ed943c4fbd4b0b0e54
Merge branch 'master' into blender2.8
source/blender/modifiers/intern/MOD_particleinstance.c