Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-06-03 00:39:32 +0400
committerThomas Dinges <blender@dingto.org>2013-06-03 00:39:32 +0400
commitc5ed6765b9c46630579be5e43cab74965f0be9da (patch)
tree0ca3bee53bec86f5bb63a005aa4cbfb04e6735a6 /intern/cycles/kernel/svm/svm_math.h
parent834492489ab9cea37ff32166895b6a298d7225e9 (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_math.h')
-rw-r--r--intern/cycles/kernel/svm/svm_math.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/svm/svm_math.h b/intern/cycles/kernel/svm/svm_math.h
index dbf477a0a96..93d432e5954 100644
--- a/intern/cycles/kernel/svm/svm_math.h
+++ b/intern/cycles/kernel/svm/svm_math.h
@@ -82,7 +82,7 @@ __device void svm_vector_math(float *Fac, float3 *Vector, NodeVectorMath type, f
*Fac = average_fac(*Vector);
}
else if(type == NODE_VECTOR_MATH_AVERAGE) {
- *Fac = len(Vector1 + Vector2);
+ *Fac = length(Vector1 + Vector2);
*Vector = normalize(Vector1 + Vector2);
}
else if(type == NODE_VECTOR_MATH_DOT_PRODUCT) {
@@ -91,11 +91,11 @@ __device void svm_vector_math(float *Fac, float3 *Vector, NodeVectorMath type, f
}
else if(type == NODE_VECTOR_MATH_CROSS_PRODUCT) {
float3 c = cross(Vector1, Vector2);
- *Fac = len(c);
+ *Fac = length(c);
*Vector = normalize(c);
}
else if(type == NODE_VECTOR_MATH_NORMALIZE) {
- *Fac = len(Vector1);
+ *Fac = length(Vector1);
*Vector = normalize(Vector1);
}
else {