diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-06-03 00:39:32 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-06-03 00:39:32 +0400 |
| commit | c5ed6765b9c46630579be5e43cab74965f0be9da (patch) | |
| tree | 0ca3bee53bec86f5bb63a005aa4cbfb04e6735a6 /intern/cycles/kernel/svm/svm_wireframe.h | |
| parent | 834492489ab9cea37ff32166895b6a298d7225e9 (diff) | |
Cycles / Math functions:
* Rename some math functions:
len -> length
len_squared -> length_squared
normalize_len -> normalize_length
* This way OpenCL uses its inbuilt length() function, rather than our own. The other two functions have been renamed for consistency.
* Tested CPU, CUDA and OpenCL compile, should be no functional changes.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_wireframe.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_wireframe.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm_wireframe.h b/intern/cycles/kernel/svm/svm_wireframe.h index 9ecb81847d7..24b29058440 100644 --- a/intern/cycles/kernel/svm/svm_wireframe.h +++ b/intern/cycles/kernel/svm/svm_wireframe.h @@ -66,8 +66,8 @@ __device void svm_node_wireframe(KernelGlobals *kg, ShaderData *sd, float *stack if(pixel_size) { // Project the derivatives of P to the viewing plane defined // by I so we have a measure of how big is a pixel at this point - float pixelwidth_x = len(sd->dP.dx - dot(sd->dP.dx, sd->I) * sd->I); - float pixelwidth_y = len(sd->dP.dy - dot(sd->dP.dy, sd->I) * sd->I); + float pixelwidth_x = length(sd->dP.dx - dot(sd->dP.dx, sd->I) * sd->I); + float pixelwidth_y = length(sd->dP.dy - dot(sd->dP.dy, sd->I) * sd->I); // Take the average of both axis' length pixelwidth = (pixelwidth_x + pixelwidth_y) * 0.5f; } |