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

[Campbell Barton]

Commit: a60d4f33c614b81f12a1dc6822f893d79c679baf
Author: Campbell Barton
Date:   Thu Jun 7 08:15:11 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa60d4f33c614b81f12a1dc6822f893d79c679baf

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/python/intern/bpy_interface.c
index d8f20d73953,aca50c2e15f..5f51f2ac152
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@@ -74,7 -74,7 +74,8 @@@
  #include "../generic/bgl.h"
  #include "../generic/blf_py_api.h"
  #include "../generic/idprop_py_api.h"
+ #include "../generic/imbuf_py_api.h"
 +#include "../gawain/gwn_py_api.h"
  #include "../bmesh/bmesh_py_api.h"
  #include "../mathutils/mathutils.h"
  
@@@ -218,9 -218,9 +219,10 @@@ static struct _inittab bpy_internal_mod
  	{"mathutils.kdtree", PyInit_mathutils_kdtree},
  #endif
  	{"_bpy_path", BPyInit__bpy_path},
 +	{"_gawain", BPyInit_gawain},
  	{"bgl", BPyInit_bgl},
  	{"blf", BPyInit_blf},
+ 	{"imbuf", BPyInit_imbuf},
  	{"bmesh", BPyInit_bmesh},
  #if 0
  	{"bmesh.types", BPyInit_bmesh_types},