[Bf-blender-cvs] [b337c96] cycles_panorama_experiments: Cycles: Fix pole merging for perspective camera

[Sergey Sharybin]

Commit: b337c969915492048af1f24c9f7de757c7e28944
Author: Sergey Sharybin
Date:   Mon May 16 18:38:08 2016 +0200
Branches: cycles_panorama_experiments
https://developer.blender.org/rBb337c969915492048af1f24c9f7de757c7e28944

Cycles: Fix pole merging for perspective camera

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

M	intern/cycles/kernel/kernel_projection.h

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

diff --git a/intern/cycles/kernel/kernel_projection.h b/intern/cycles/kernel/kernel_projection.h
index 1d2fd33..51915ce 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;
 		}