[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58158] trunk/blender/intern/cycles/kernel /kernel_camera.h: Fix #36053: slow GPU render with panorama camera + depth of field.
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Jul 10 19:25:52 CEST 2013
Revision: 58158
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58158
Author: blendix
Date: 2013-07-10 17:25:52 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Fix #36053: slow GPU render with panorama camera + depth of field.
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-07-10 16:46:13 UTC (rev 58157)
+++ trunk/blender/intern/cycles/kernel/kernel_camera.h 2013-07-10 17:25:52 UTC (rev 58158)
@@ -166,6 +166,12 @@
ray->D = panorama_to_direction(kg, Pcamera.x, Pcamera.y);
+ /* indicates ray should not receive any light, outside of the lens */
+ if(is_zero(ray->D)) {
+ ray->t = 0.0f;
+ return;
+ }
+
/* modify ray for depth of field */
float aperturesize = kernel_data.cam.aperturesize;
@@ -186,12 +192,6 @@
ray->D = normalize(Pfocus - ray->P);
}
- /* indicates ray should not receive any light, outside of the lens */
- if(is_zero(ray->D)) {
- ray->t = 0.0f;
- return;
- }
-
/* transform ray from camera to world */
Transform cameratoworld = kernel_data.cam.cameratoworld;
More information about the Bf-blender-cvs
mailing list