From 54363910bc0d6a0e066d2508b216b5ad698f9185 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 4 Apr 2013 23:52:33 +0000 Subject: Attempt to fix #34871: random CUDA 3.5 compile failure due to recent change. --- intern/cycles/kernel/kernel_camera.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'intern/cycles/kernel/kernel_camera.h') diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h index 694ef8bd01d..800daf40887 100644 --- a/intern/cycles/kernel/kernel_camera.h +++ b/intern/cycles/kernel/kernel_camera.h @@ -115,10 +115,10 @@ __device void camera_sample_orthographic(KernelGlobals *kg, float raster_x, floa 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 */ -- cgit v1.2.3