Merge remote-tracking branch 'origin/master' into blender2.8

2018-01-19 12:46:23 -02:00
parent 7866870a9a edf053ff63
commit d9858d5897
38 changed files with 29 additions and 58 deletions
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -21,6 +21,7 @@
 #include "blender/blender_sync.h"
 #include "blender/blender_session.h"

+#include "util/util_debug.h"
 #include "util/util_foreach.h"
 #include "util/util_logging.h"
 #include "util/util_md5.h"