Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 8 Sep 2018 13:32:44 +0000 (15:32 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 8 Sep 2018 13:32:44 +0000 (15:32 +0200)
commit73e9ae608c8e03a4fc0cbcaca09c3ca9d1b0131b
treeed79633b52c2ba5cd76f59ec302a88e069855538
parent5a1e9e5af85dd8858d9195718b026ca600b589a7
parent4594cc25ac8f8c07e62eb32f745be01e9444c2b4
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/intern/lattice.c