Merge branch 'master' into blender2.8
authorKévin Dietrich <kevin.dietrich@mailoo.org>
Sat, 24 Feb 2018 13:02:50 +0000 (14:02 +0100)
committerKévin Dietrich <kevin.dietrich@mailoo.org>
Sat, 24 Feb 2018 13:02:50 +0000 (14:02 +0100)
commit94eb1897523d4cf464ea0cdf90ccbd7db90f997d
treebcb82d0c8360f195046ab93b1a222acf0ad0f4f1
parentc4abb331027ab294618c5ab49d3f9d2dfc67596f
parent4403ca80bda690c0ac44e4a6db0cddf4b2428006
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/BKE_blender_version.h
release/scripts/startup/bl_ui/properties_physics_smoke.py
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenloader/intern/versioning_270.c
source/blender/makesrna/intern/rna_smoke.c