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:
authorCampbell Barton <ideasman42@gmail.com>2014-05-04 20:19:08 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-05-04 20:19:08 +0400
commitdc13969e484ed9fa6834b1aba85ba00f65bf8a11 (patch)
treeaffc2efd3e5c8637fbfcaf0b3be87a78781876b9 /intern/cycles/kernel/geom/geom_object.h
parente86dbf687769a7f38ab465c89d1111a8be691ca2 (diff)
Style cleanup: indentation, braces
Diffstat (limited to 'intern/cycles/kernel/geom/geom_object.h')
-rw-r--r--intern/cycles/kernel/geom/geom_object.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/geom_object.h
index 5b0127f8a3b..91edd5863ac 100644
--- a/intern/cycles/kernel/geom/geom_object.h
+++ b/intern/cycles/kernel/geom/geom_object.h
@@ -366,8 +366,8 @@ ccl_device_inline float3 bvh_clamp_direction(float3 dir)
/* clamp absolute values by exp2f(-80.0f) to avoid division by zero when calculating inverse direction */
float ooeps = 8.271806E-25f;
return make_float3((fabsf(dir.x) > ooeps)? dir.x: copysignf(ooeps, dir.x),
- (fabsf(dir.y) > ooeps)? dir.y: copysignf(ooeps, dir.y),
- (fabsf(dir.z) > ooeps)? dir.z: copysignf(ooeps, dir.z));
+ (fabsf(dir.y) > ooeps)? dir.y: copysignf(ooeps, dir.y),
+ (fabsf(dir.z) > ooeps)? dir.z: copysignf(ooeps, dir.z));
}
ccl_device_inline float3 bvh_inverse_direction(float3 dir)