Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Tue, 18 Dec 2018 14:10:35 +0000 (15:10 +0100)
committerPhilipp Oeser <info@graphics-engineer.com>
Tue, 18 Dec 2018 14:10:35 +0000 (15:10 +0100)
commit37c2382a49ee47974d588ea363d87d5e81b1a4df
tree91f36d22267a91248926be1e08f759111ed29f8e
parent8c4ae8961cb2447cce64667b5dc40785f3b4709a
parentd542e55b096ba3d8e14cac2e4d314f0a5e759982
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/smoke.c