Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Fri, 18 May 2018 12:59:38 +0000 (14:59 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Fri, 18 May 2018 12:59:38 +0000 (14:59 +0200)
1  2 
source/blender/editors/curve/editcurve_paint.c
source/blender/makesrna/intern/rna_smoke.c