Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 15:07:09 +0000 (01:07 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 15:07:09 +0000 (01:07 +1000)
1  2 
source/blender/editors/space_view3d/view3d_edit.c
source/blender/windowmanager/intern/wm_files.c
source/blenderplayer/bad_level_call_stubs/stubs.c