diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-04-16 00:01:20 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-04-16 00:02:44 +0300 |
| commit | 9c916b0172350fa405c578db7487c49ea65c0f26 (patch) | |
| tree | 87ef08dad1e8c64045be004f9251990954c7a8ad /intern/cycles/kernel | |
| parent | 34c99fa30ade70d7677972ab18acc4c6ad52558b (diff) | |
Cleanup: Move texture definitions to util, to avoid bad level include.
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/kernel_math.h | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_math.h b/intern/cycles/kernel/kernel_math.h index 453f4c8b421..9bee5603474 100644 --- a/intern/cycles/kernel/kernel_math.h +++ b/intern/cycles/kernel/kernel_math.h @@ -20,6 +20,7 @@ #include "util_color.h" #include "util_math.h" #include "util_math_fast.h" +#include "util_texture.h" #include "util_transform.h" #endif /* __KERNEL_MATH_H__ */ diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index cce4ded3013..c9a895d9aec 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -48,8 +48,6 @@ CCL_NAMESPACE_BEGIN #define BECKMANN_TABLE_SIZE 256 -#define TEX_NUM_FLOAT_IMAGES 5 - #define SHADER_NONE (~0) #define OBJECT_NONE (~0) #define PRIM_NONE (~0) |