Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 16 Feb 2018 10:51:41 +0000 (11:51 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 16 Feb 2018 10:51:41 +0000 (11:51 +0100)
commitc3ace7950dca128279522858f20cc19dcbc15ed0
treef2e0cc761659767b9bd2135e9c4955df191c201c
parentfa0e89b9e857b8696dbecdfe82aa7adea6d5a947
parent8dfe9ef4e3cac3fa9c3d22c180fc92820b440026
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/readfile.c
source/blenderplayer/bad_level_call_stubs/stubs.c