[Bf-blender-cvs] [7602b6b] master: Cycles: Fix typo

Sergey Sharybin noreply at git.blender.org
Mon Jul 11 18:01:08 CEST 2016


Commit: 7602b6bf624a816b313962305a9403bf981ddb97
Author: Sergey Sharybin
Date:   Mon Jul 11 18:01:40 2016 +0200
Branches: master
https://developer.blender.org/rB7602b6bf624a816b313962305a9403bf981ddb97

Cycles: Fix typo

===================================================================

M	intern/cycles/kernel/bvh/bvh_nodes.h

===================================================================

diff --git a/intern/cycles/kernel/bvh/bvh_nodes.h b/intern/cycles/kernel/bvh/bvh_nodes.h
index a809683..853976f 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;
 	}
 }




More information about the Bf-blender-cvs mailing list