1 files changed, 26 insertions, 12 deletions

diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index d78a82d589a..25b4d1f08cc 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -51,20 +51,23 @@ Object::~Object()
 {
 }
 
-void Object::compute_bounds(bool motion_blur)
+void Object::compute_bounds(bool motion_blur, float shuttertime)
 {
 	BoundBox mbounds = mesh->bounds;
 
 	if(motion_blur && use_motion) {
 		MotionTransform decomp;
-		transform_motion_decompose(&decomp, &motion);
+		transform_motion_decompose(&decomp, &motion, &tfm);
 
 		bounds = BoundBox::empty;
 
 		/* todo: this is really terrible. according to pbrt there is a better
 		 * way to find this iteratively, but did not find implementation yet
 		 * or try to implement myself */
-		for(float t = 0.0f; t < 1.0f; t += 1.0f/128.0f) {
+		float start_t = 0.5f - shuttertime*0.25f;
+		float end_t = 0.5f + shuttertime*0.25f;
+
+		for(float t = start_t; t < end_t; t += (1.0f/128.0f)*shuttertime) {
 			Transform ttfm;
 
 			transform_motion_interpolate(&ttfm, &decomp, t);
@@ -109,7 +112,7 @@ void Object::apply_transform()
 
 	if(bounds.valid()) {
 		mesh->compute_bounds();
-		compute_bounds(false);
+		compute_bounds(false, 0.0f);
 	}
 
 	/* tfm is not reset to identity, all code that uses it needs to check the
@@ -151,7 +154,8 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene
 	uint *object_flag = dscene->object_flag.resize(scene->objects.size());
 	int i = 0;
 	map<Mesh*, float> surface_area_map;
-	Scene::MotionType need_motion = scene->need_motion();
+	Scene::MotionType need_motion = scene->need_motion(device->info.advanced_shading);
+	bool have_motion = false;
 
 	foreach(Object *ob, scene->objects) {
 		Mesh *mesh = ob->mesh;
@@ -218,26 +222,29 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene
 				mtfm_post = mtfm_post * itfm;
 
 			memcpy(&objects[offset+8], &mtfm_pre, sizeof(float4)*4);
-			memcpy(&objects[offset+12], &mtfm_post, sizeof(float4)*4);
+			memcpy(&objects[offset+16], &mtfm_post, sizeof(float4)*4);
 		}
+#ifdef __OBJECT_MOTION__
 		else if(need_motion == Scene::MOTION_BLUR) {
 			if(ob->use_motion) {
 				/* decompose transformations for interpolation */
 				MotionTransform decomp;
 
-				transform_motion_decompose(&decomp, &ob->motion);
-				memcpy(&objects[offset+8], &decomp, sizeof(float4)*8);
+				transform_motion_decompose(&decomp, &ob->motion, &ob->tfm);
+				memcpy(&objects[offset+8], &decomp, sizeof(float4)*12);
 				flag |= SD_OBJECT_MOTION;
+				have_motion = true;
 			}
 			else {
 				float4 no_motion = make_float4(FLT_MAX);
-				memcpy(&objects[offset+8], &no_motion, sizeof(float4));
+				memcpy(&objects[offset+8], &no_motion, sizeof(float4)*12);
 			}
 		}
+#endif
 
 		/* dupli object coords */
-		objects[offset+16] = make_float4(ob->dupli_generated[0], ob->dupli_generated[1], ob->dupli_generated[2], 0.0f);
-		objects[offset+17] = make_float4(ob->dupli_uv[0], ob->dupli_uv[1], 0.0f, 0.0f);
+		objects[offset+20] = make_float4(ob->dupli_generated[0], ob->dupli_generated[1], ob->dupli_generated[2], 0.0f);
+		objects[offset+21] = make_float4(ob->dupli_uv[0], ob->dupli_uv[1], 0.0f, 0.0f);
 
 		/* object flag */
 		if(ob->use_holdout)
@@ -251,6 +258,8 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene
 
 	device->tex_alloc("__objects", dscene->objects);
 	device->tex_alloc("__object_flag", dscene->object_flag);
+
+	dscene->data.bvh.have_motion = have_motion;
 }
 
 void ObjectManager::device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress)
@@ -297,7 +306,12 @@ void ObjectManager::apply_static_transforms(Scene *scene, Progress& progress)
 
 	/* counter mesh users */
 	map<Mesh*, int> mesh_users;
-	bool motion_blur = scene->need_motion() == Scene::MOTION_BLUR;
+#ifdef __OBJECT_MOTION__
+	Scene::MotionType need_motion = scene->need_motion();
+	bool motion_blur = need_motion == Scene::MOTION_BLUR;
+#else
+	bool motion_blur = false;
+#endif
 
 	foreach(Object *object, scene->objects) {
 		map<Mesh*, int>::iterator it = mesh_users.find(object->mesh);