diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-23 17:25:27 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-23 17:25:27 +0300 |
| commit | 21f16bb93e1e29a9737edc5bfddcecdcbdfd9f73 (patch) | |
| tree | 3ce8a5a3ce4442f64872ad38fccbcad31379aa59 /intern/cycles/util | |
| parent | 8eb8aa49397fb038ffa98dbe5dc4aed86e7b3e94 (diff) | |
| parent | 4f8e407086068e3eeca50db6b37b5c8a5a358696 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_logging.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/util/util_logging.h b/intern/cycles/util/util_logging.h index 492f830e67c..5c84b6593d3 100644 --- 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 |