Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2018 06:15:11 +0000 (08:15 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2018 06:15:11 +0000 (08:15 +0200)
1  2 
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},