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)
commit0671814e3b9450e0fed5109e059b6f9dc421e120
tree06994ff0af927c1089bf2c23e82318c700c34d64
parentcb4884f50b80c7a5b115bb066b9b662af7e62297
parent0b5b464e823660f4ce47107d63004e762372122e
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/view3d_edit.c
source/blender/windowmanager/intern/wm_files.c
source/blenderplayer/bad_level_call_stubs/stubs.c