Merge branch 'master' into blender2.8

2017-11-29 21:30:03 +11:00
parent 69d33ecdec e32cfb0743
commit 28048f75ce
16 changed files with 25 additions and 25 deletions
--- a/source/blender/python/intern/bpy_library_load.c
+++ b/source/blender/python/intern/bpy_library_load.c
@@ -48,7 +48,7 @@

 #include "BLO_readfile.h"

-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
 #include "bpy_library.h"

 #include "../generic/py_capi_utils.h"