Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 8 Aug 2017 17:16:25 +0000 (19:16 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 8 Aug 2017 17:16:25 +0000 (19:16 +0200)
commit8563494823bd3ad9643e0e05c88eee7763196be8
tree17b0b19d91f05efe14d75c1d6c3689e04a1bb177
parente8b6bcd65c946f5eb9623638eebcd93ed74d9358
parentb6d7cdd3cee9312156e20783248a3b12420b7a53
Merge branch 'master' into blender2.8

Conflicts:
source/blender/modifiers/intern/MOD_meshsequencecache.c
source/blender/editors/interface/interface_layout.c
source/blender/modifiers/intern/MOD_meshsequencecache.c