diff options
author | Thomas Dinges <blender@dingto.org> | 2013-05-12 18:13:29 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-05-12 18:13:29 +0400 |
commit | 7636aeffe1674ea2281869a0d81cbe20ee42e8b9 (patch) | |
tree | 61ab2f2c9bd74ff35d074e4f27a0885b6ac98a32 /intern/cycles/kernel/svm | |
parent | 469979f9cb08640fbc00a43b59eee459460e74e1 (diff) |
Cycles / Math:
* Add M_2PI_F and M_4PI_F constants and use them inside the codebase.
Diffstat (limited to 'intern/cycles/kernel/svm')
-rw-r--r-- | intern/cycles/kernel/svm/svm_closure.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_gradient.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h index 72e6a047158..d97e165c66d 100644 --- a/intern/cycles/kernel/svm/svm_closure.h +++ b/intern/cycles/kernel/svm/svm_closure.h @@ -287,7 +287,7 @@ __device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *st float rotation = stack_load_float(stack, data_node.w); if(rotation != 0.0f) - sc->T = rotate_around_axis(sc->T, sc->N, rotation * 2.0f * M_PI_F); + sc->T = rotate_around_axis(sc->T, sc->N, rotation * M_2PI_F); /* compute roughness */ float roughness = param1; diff --git a/intern/cycles/kernel/svm/svm_gradient.h b/intern/cycles/kernel/svm/svm_gradient.h index 7fad1175c49..95c662ac28b 100644 --- a/intern/cycles/kernel/svm/svm_gradient.h +++ b/intern/cycles/kernel/svm/svm_gradient.h @@ -45,7 +45,7 @@ __device float svm_gradient(float3 p, NodeGradientType type) return (x + y)/2.0f; } else if(type == NODE_BLEND_RADIAL) { - return atan2f(y, x) / (2.0f * M_PI_F) + 0.5f; + return atan2f(y, x) / M_2PI_F + 0.5f; } else { float r = fmaxf(1.0f - sqrtf(x*x + y*y + z*z), 0.0f); |