Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Oct 2017 03:31:19 +0000 (14:31 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Oct 2017 03:31:19 +0000 (14:31 +1100)
1  2 
source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_gesture.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/wm.h

Simple merge