Merge branch 'master' into blender2.8

2018-03-23 15:25:27 +01:00
parent 8eb8aa4939 4f8e407086
commit 21f16bb93e
19 changed files with 47 additions and 73 deletions
--- a/intern/cycles/util/util_logging.h
+++ b/intern/cycles/util/util_logging.h
@@ -18,6 +18,7 @@
 #define __UTIL_LOGGING_H__

 #if defined(WITH_CYCLES_LOGGING) && !defined(__KERNEL_GPU__)
+#  include <gflags/gflags.h>
 #  include <glog/logging.h>
 #endif