[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51363] trunk/blender/intern/cycles: Cycles: object motion blur enabled, so in addition to camera motion, moving

[Brecht Van Lommel]

Revision: 51363
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51363
Author:   blendix
Date:     2012-10-16 10:48:19 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Cycles: object motion blur enabled, so in addition to camera motion, moving
objects in the scene will also cause motion blur.

This change does come with a bit of a slow down to the CPU rendering kernel even
with motion blur disabled, due to extra overhead in handling of object matrices.
It's a few percentages on simpler scenes, not so noticeable on more complex ones.
With motion blur enabled rendering is of course also slower as would be expected,
though from testing especially GPU rendering handles it quite well.

This does not support motion blur from deforming objects yet, only translation,
scale and rotation. Deformation blur is probably for another release.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py
    trunk/blender/intern/cycles/kernel/kernel_shader.h
    trunk/blender/intern/cycles/kernel/kernel_types.h

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2012-10-16 10:29:34 UTC (rev 51362)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2012-10-16 10:48:19 UTC (rev 51363)
@@ -131,7 +131,7 @@
 
 
 class CyclesRender_PT_motion_blur(CyclesButtonsPanel, Panel):
-    bl_label = "Camera Motion Blur"
+    bl_label = "Motion Blur"
     bl_options = {'DEFAULT_CLOSED'}
 
     def draw_header(self, context):

Modified: trunk/blender/intern/cycles/kernel/kernel_shader.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_shader.h	2012-10-16 10:29:34 UTC (rev 51362)
+++ trunk/blender/intern/cycles/kernel/kernel_shader.h	2012-10-16 10:48:19 UTC (rev 51363)
@@ -73,7 +73,7 @@
 	/* matrices and time */
 #ifdef __OBJECT_MOTION__
 	if(sd->flag & SD_OBJECT_MOTION) {
-		sd->ob_tfm = object_fetch_transform_motion(kg, sd->object, time, &sd->ob_itfm);
+		sd->ob_tfm = object_fetch_transform_motion(kg, sd->object, ray->time, &sd->ob_itfm);
 	}
 	else {
 		sd->ob_tfm = object_fetch_transform(kg, sd->object, OBJECT_TRANSFORM);

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2012-10-16 10:29:34 UTC (rev 51362)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2012-10-16 10:48:19 UTC (rev 51363)
@@ -109,7 +109,7 @@
 #define __BACKGROUND_MIS__
 #define __AO__
 #define __CAMERA_MOTION__
-//#define __OBJECT_MOTION__
+#define __OBJECT_MOTION__
 #endif
 
 //#define __SOBOL_FULL_SCREEN__