[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55793] trunk/blender/intern/cycles/kernel /kernel_camera.h: Attempt to fix #34871: random CUDA 3. 5 compile failure due to recent change.

[Brecht Van Lommel]

Revision: 55793
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55793
Author:   blendix
Date:     2013-04-04 23:52:33 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
Attempt to fix #34871: random CUDA 3.5 compile failure due to recent change.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_camera.h

Modified: trunk/blender/intern/cycles/kernel/kernel_camera.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_camera.h	2013-04-04 23:48:07 UTC (rev 55792)
+++ trunk/blender/intern/cycles/kernel/kernel_camera.h	2013-04-04 23:52:33 UTC (rev 55793)
@@ -115,10 +115,10 @@
 		float3 Pfocus = ray->D*ft;
 
 		/* update ray for effect of lens */
-		ray->P = make_float3(lensuv.x, lensuv.y, 0.0f);
-		ray->D = normalize(Pfocus - ray->P);
+		float3 lensuvw = make_float3(lensuv.x, lensuv.y, 0.0f);
 
-		ray->P += Pcamera;
+		ray->P += lensuvw;
+		ray->D = normalize(Pfocus - lensuvw);
 	}
 
 	/* transform ray from camera to world */