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)
commit6e48afeb238b5935273891048be80b9a3a78027f
treeb6ed82ea960775d2dec6cf49799d020d06fa327b
parentb167bc2f008522427deab016ca0fd55b01920abf
parent5e7a21a5f549f5db73385820cafcd8f2bb9c91da
Merge branch 'master' into blender2.8
source/blender/editors/curve/editcurve_paint.c
source/blender/makesrna/intern/rna_smoke.c