[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54051] trunk/blender/intern/cycles: Fix #33915: tweak self intersection epsilon for motion blur a bit further, still

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Jan 23 17:56:08 CET 2013


Revision: 54051
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54051
Author:   blendix
Date:     2013-01-23 16:56:02 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Fix #33915: tweak self intersection epsilon for motion blur a bit further, still
had some cases where there were artifacts. Also fix rendering error with shutter
time set to 0.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_bvh.h
    trunk/blender/intern/cycles/kernel/kernel_camera.h
    trunk/blender/intern/cycles/render/camera.cpp

Modified: trunk/blender/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-01-23 16:38:09 UTC (rev 54050)
+++ trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-01-23 16:56:02 UTC (rev 54051)
@@ -929,7 +929,7 @@
 	const float epsilon_f = 1e-5f;
 	/* ideally this should match epsilon_f, but instancing/mblur
 	 * precision makes it problematic */
-	const float epsilon_test = 1e-1f;
+	const float epsilon_test = 1.0f;
 	const int epsilon_i = 32;
 
 	float3 res;

Modified: trunk/blender/intern/cycles/kernel/kernel_camera.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_camera.h	2013-01-23 16:38:09 UTC (rev 54050)
+++ trunk/blender/intern/cycles/kernel/kernel_camera.h	2013-01-23 16:56:02 UTC (rev 54051)
@@ -213,7 +213,7 @@
 
 #ifdef __CAMERA_MOTION__
 	/* motion blur */
-	if(kernel_data.cam.shuttertime == 0.0f)
+	if(kernel_data.cam.shuttertime == -1.0f)
 		ray->time = TIME_INVALID;
 	else
 		ray->time = 0.5f + 0.5f*(time - 0.5f)*kernel_data.cam.shuttertime;

Modified: trunk/blender/intern/cycles/render/camera.cpp
===================================================================
--- trunk/blender/intern/cycles/render/camera.cpp	2013-01-23 16:38:09 UTC (rev 54050)
+++ trunk/blender/intern/cycles/render/camera.cpp	2013-01-23 16:56:02 UTC (rev 54051)
@@ -216,9 +216,9 @@
 
 	/* motion blur */
 #ifdef __CAMERA_MOTION__
-	kcam->shuttertime = (need_motion == Scene::MOTION_BLUR) ? shuttertime: 0.0f;
+	kcam->shuttertime = (need_motion == Scene::MOTION_BLUR) ? shuttertime: -1.0f;
 #else
-	kcam->shuttertime = 0.0f;
+	kcam->shuttertime = -1.0f;
 #endif
 
 	/* type */




More information about the Bf-blender-cvs mailing list