diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-09 10:16:41 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-09 10:16:41 +0300 |
| commit | d6555d936cb15c3d64836ca1446bfc7b065b4aa0 (patch) | |
| tree | 12f61bb782637620d9a2cad159c5cf9a4ded50a3 /intern/cycles/device/device_cpu.cpp | |
| parent | e0e7d94f79a512dd33d2f8cdf1685112a8327674 (diff) | |
Cleanup: Avoid duplicative defines for CPU textures, use the ones from util_texture.h
Also includes some further byte -> byte4 renaming, missed that in last commit.
Diffstat (limited to 'intern/cycles/device/device_cpu.cpp')
| -rw-r--r-- | intern/cycles/device/device_cpu.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index 676b1279a80..4d0a57d870a 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -27,6 +27,9 @@ #include "device.h" #include "device_intern.h" +/* Texture limits and slot info */ +#include "util_texture.h" + #include "kernel.h" #include "kernel_compat_cpu.h" #include "kernel_types.h" |