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)
commit14af3e485f1207e8f4ddb6991b22e1ba2f937c45
tree157e34ab31912db5db2cd08f5c216b5971fb3d23
parenta1bb2ae0d7be4031c9dc1abb805b68d2338c96ea
parent137586a13c758d95472c3a3eabfc7dd4b22b7502
Merge branch 'master' into blender2.8
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