Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 24 Oct 2018 07:00:13 +0000 (09:00 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 24 Oct 2018 07:00:13 +0000 (09:00 +0200)
commit8ccb27fc0ad45661f627aff552a0a9615633dea7
treec476c8a34f009bf6b7435f00ee8d79876c36ce4d
parent7b79216c5463a025554d9bbc7e4f1fc150742b52
parent65d4314b8e43c0d1e30ec105a929a1adf4268d01
Merge branch 'master' into blender2.8

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