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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-07-11 19:01:40 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-07-11 19:01:40 +0300
commit7602b6bf624a816b313962305a9403bf981ddb97 (patch)
tree5d1fe9ebd54a2b898c5e7f7f6778de7c56121d00 /intern/cycles/kernel/bvh/bvh_nodes.h
parentea32a0380148b3261679eded2149ebac7e3a15ef (diff)
Cycles: Fix typo
Diffstat (limited to 'intern/cycles/kernel/bvh/bvh_nodes.h')
-rw-r--r--intern/cycles/kernel/bvh/bvh_nodes.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/bvh/bvh_nodes.h b/intern/cycles/kernel/bvh/bvh_nodes.h
index a8096830bae..853976fdf06 100644
--- a/intern/cycles/kernel/bvh/bvh_nodes.h
+++ b/intern/cycles/kernel/bvh/bvh_nodes.h
@@ -189,16 +189,16 @@ ccl_device_inline bool bvh_unaligned_node_intersect_child_robust(
const float far_y = max(tLowerXYZ.y, tUpperXYZ.y);
const float far_z = max(tLowerXYZ.z, tUpperXYZ.z);
const float near = max4(0.0f, near_x, near_y, near_z);
- const float gar = min4(t, far_x, far_y, far_z);
+ const float far = min4(t, far_x, far_y, far_z);
*dist = near;
if(difl != 0.0f) {
/* TODO(sergey): Same as for QBVH, needs a proper use. */
const float round_down = 1.0f - difl;
const float round_up = 1.0f + difl;
- return round_down*near <= round_up*gar;
+ return round_down*near <= round_up*far;
}
else {
- return near <= gar;
+ return near <= far;
}
}