diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-06-08 23:57:25 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-06-08 23:57:25 +0400 |
| commit | 7c87f646c256dc8b8a97de2ad2d5c4b0dbe1a4a0 (patch) | |
| tree | f1dbdd98367d5765aa3e4c5411c22d385dbba163 /intern/cycles/kernel/svm/svm_gradient.h | |
| parent | 3d740121ed6f0264ae85eeafe6c0a5addf68ac8c (diff) | |
Cycles / Textures:
* Some code cleanup, removed old enums, which are not used anymore.
* Some renaming for consistency and to match new texture names.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_gradient.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_gradient.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm_gradient.h b/intern/cycles/kernel/svm/svm_gradient.h index c7013800d6b..ce551a680b8 100644 --- a/intern/cycles/kernel/svm/svm_gradient.h +++ b/intern/cycles/kernel/svm/svm_gradient.h @@ -20,7 +20,7 @@ CCL_NAMESPACE_BEGIN /* Gradient */ -__device float svm_gradient(float3 p, NodeBlendType type) +__device float svm_gradient(float3 p, NodeGradientType type) { float x, y, z; @@ -67,7 +67,7 @@ __device void svm_node_tex_gradient(ShaderData *sd, float *stack, uint4 node) float3 co = stack_load_float3(stack, co_offset); - float f = svm_gradient(co, (NodeBlendType)type); + float f = svm_gradient(co, (NodeGradientType)type); f = clamp(f, 0.0f, 1.0f); if(stack_valid(fac_offset)) |