diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-01-19 17:46:23 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-01-19 17:46:23 +0300 |
| commit | d9858d5897efbf0e41ebe61c2aaabf451c33d6ad (patch) | |
| tree | 96661f5f7e5309ea6d5e9a803af77112ed039d89 /intern/cycles/device/device.cpp | |
| parent | 7866870a9a58ce086f4af5dc7dc7bc8acf1e333c (diff) | |
| parent | edf053ff635e782d09b64d205fadfca3cce79de4 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device.cpp')
| -rw-r--r-- | intern/cycles/device/device.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index d6f5c5af428..60805511951 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -20,7 +20,6 @@ #include "device/device.h" #include "device/device_intern.h" -#include "util/util_debug.h" #include "util/util_foreach.h" #include "util/util_half.h" #include "util/util_logging.h" |