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-05-16 19:38:08 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-05-16 19:38:08 +0300
commitb337c969915492048af1f24c9f7de757c7e28944 (patch)
treec068a36407b2395f2d74e43d709832ddfedbaddf
parente5b619dae17bca006bbf7000703565c617e8ac1f (diff)
Cycles: Fix pole merging for perspective camera
-rw-r--r--intern/cycles/kernel/kernel_projection.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_projection.h b/intern/cycles/kernel/kernel_projection.h
index 1d2fd33aee7..51915cec0e6 100644
--- a/intern/cycles/kernel/kernel_projection.h
+++ b/intern/cycles/kernel/kernel_projection.h
@@ -460,9 +460,10 @@ ccl_device float3 spherical_stereo_position(KernelGlobals *kg,
}
if(kernel_data.cam.use_pole_merge) {
+ float3 normalized_direction = normalize(dir);
const float pole_merge_angle_from = kernel_data.cam.pole_merge_angle_from,
pole_merge_angle_to = kernel_data.cam.pole_merge_angle_to;
- float altitude = fabsf(safe_asinf(dir.z));
+ float altitude = fabsf(safe_asinf(normalized_direction.z));
if(altitude > pole_merge_angle_to) {
interocular_offset = 0.0f;
}