[Bf-blender-cvs] [f2c77558b42] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: f2c77558b429a5ee25326c097a567600ef3c1f88
Author: Campbell Barton
Date:   Thu Oct 25 15:19:35 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBf2c77558b429a5ee25326c097a567600ef3c1f88

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/windowmanager/WM_api.h
index 1db4b4328e9,5ee7763272b..98df18169cd
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -54,10 -53,9 +54,11 @@@ struct wmEvent
  struct wmEventHandler;
  struct wmGesture;
  struct wmJob;
 +struct wmMsgSubscribeKey;
 +struct wmMsgSubscribeValue;
  struct wmOperatorType;
  struct wmOperator;
+ struct wmPaintCursor;
  struct rcti;
  struct PointerRNA;
  struct PropertyRNA;