diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-05 03:52:33 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-05 03:52:33 +0400 |
| commit | 54363910bc0d6a0e066d2508b216b5ad698f9185 (patch) | |
| tree | 4523dd10a75cd116a7107a48c61e17828e46609a /intern/cycles/kernel/kernel_camera.h | |
| parent | c77f46d2dd28b2d450f29a51df133dfa7aff35d9 (diff) | |
Attempt to fix #34871: random CUDA 3.5 compile failure due to recent change.
Diffstat (limited to 'intern/cycles/kernel/kernel_camera.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_camera.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 */ |