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.c
+++ b/source/blender/python/intern/bpy.c
@@ -42,7 +42,7 @@
 #include "RNA_access.h"

 #include "bpy.h"
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
 #include "bpy_rna.h"
 #include "bpy_app.h"
 #include "bpy_rna_id_collection.h"