[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55839] trunk/blender/intern/cycles/kernel /kernel_camera.h: fix: #34871 Cycles/CUDA/sm_35: Build problems probably due to issues with float3 operators (on windows?)

Gaia Clary gaia.clary at machinimatrix.org
Sat Apr 6 13:52:41 CEST 2013


Revision: 55839
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55839
Author:   gaiaclary
Date:     2013-04-06 11:52:40 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
fix: #34871 Cycles/CUDA/sm_35: Build problems probably due to issues with float3 operators (on windows?)

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-06 10:52:52 UTC (rev 55838)
+++ trunk/blender/intern/cycles/kernel/kernel_camera.h	2013-04-06 11:52:40 UTC (rev 55839)
@@ -100,7 +100,6 @@
 	Transform rastertocamera = kernel_data.cam.rastertocamera;
 	float3 Pcamera = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y, 0.0f));
 
-	ray->P = Pcamera;
 	ray->D = make_float3(0.0f, 0.0f, 1.0f);
 
 	/* modify ray for depth of field */
@@ -116,11 +115,12 @@
 
 		/* update ray for effect of lens */
 		float3 lensuvw = make_float3(lensuv.x, lensuv.y, 0.0f);
-
-		ray->P += lensuvw;
+		ray->P = Pcamera + lensuvw;
 		ray->D = normalize(Pfocus - lensuvw);
 	}
-
+	else {
+		ray->P = Pcamera;
+	}
 	/* transform ray from camera to world */
 	Transform cameratoworld = kernel_data.cam.cameratoworld;
 




More information about the Bf-blender-cvs mailing list