Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 18 Jul 2017 08:10:19 +0000 (18:10 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 18 Jul 2017 08:10:19 +0000 (18:10 +1000)
commit876cc5b7c04ceffb24acdb8d2abba0159429abac
tree81db5f762e042098f160ca36e58a1bc99ee2f880
parent2475dbdc94d8ebc53e7285e69c9900b7989f1e1c
parent2174a2118b589b4b6805f901ffff2e29f5e32259
Merge branch 'master' into blender2.8
source/blender/editors/animation/anim_markers.c
source/blender/editors/space_view3d/view3d_walk.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c