[Bf-blender-cvs] [ebe306b] master: Cycles: Cleanup, redundant normalization

Sergey Sharybin noreply at git.blender.org
Fri Mar 11 10:46:11 CET 2016


Commit: ebe306b8d2d0377705f9e3d66fe71465ab14d210
Author: Sergey Sharybin
Date:   Fri Mar 11 14:12:10 2016 +0500
Branches: master
https://developer.blender.org/rBebe306b8d2d0377705f9e3d66fe71465ab14d210

Cycles: Cleanup, redundant normalization

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

M	intern/cycles/kernel/kernel_camera.h

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

diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h
index cddb87d..e116ec3 100644
--- a/intern/cycles/kernel/kernel_camera.h
+++ b/intern/cycles/kernel/kernel_camera.h
@@ -115,18 +115,16 @@ ccl_device void camera_sample_perspective(KernelGlobals *kg, float raster_x, flo
 	/* ray differential */
 	ray->dP = differential3_zero();
 
-	const float3 Ddiff = normalize(ray->D);
-
 	tP = transform_perspective(&rastertocamera, make_float3(raster_x + 1.0f, raster_y, 0.0f));
 	tD = transform_direction(&cameratoworld, tP);
 	Pcamera = spherical_stereo_position(kg, tD, tP);
-	ray->dD.dx = normalize(spherical_stereo_direction(kg, tD, tP, Pcamera)) - Ddiff;
+	ray->dD.dx = normalize(spherical_stereo_direction(kg, tD, tP, Pcamera)) - ray->D;
 	ray->dP.dx = Pcamera - ray->P;
 
 	tP = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y + 1.0f, 0.0f));
 	tD = transform_direction(&cameratoworld, tP);
 	Pcamera = spherical_stereo_position(kg, tD, tP);
-	ray->dD.dy = normalize(spherical_stereo_direction(kg, tD, tP, Pcamera)) - Ddiff;
+	ray->dD.dy = normalize(spherical_stereo_direction(kg, tD, tP, Pcamera)) - ray->D;
 	/* dP.dy is zero, since the omnidirectional panorama only shift the eyes horizontally */
 #endif




More information about the Bf-blender-cvs mailing list