[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52259] trunk/blender/intern/cycles/ blender/blender_sync.cpp: Fix #33170: cycles viewport update issue with motion blur enabled

[Brecht Van Lommel]

Revision: 52259
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52259
Author:   blendix
Date:     2012-11-15 21:52:17 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Fix #33170: cycles viewport update issue with motion blur enabled
(which is supposed to do nothing in this case).

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_sync.cpp

Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp	2012-11-15 21:40:18 UTC (rev 52258)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp	2012-11-15 21:52:17 UTC (rev 52259)
@@ -179,12 +179,14 @@
 
 	integrator->sample_clamp = get_float(cscene, "sample_clamp");
 #ifdef __CAMERA_MOTION__
-	if(integrator->motion_blur != r.use_motion_blur()) {
-		scene->object_manager->tag_update(scene);
-		scene->camera->tag_update();
+	if(!preview) {
+		if(integrator->motion_blur != r.use_motion_blur()) {
+			scene->object_manager->tag_update(scene);
+			scene->camera->tag_update();
+		}
+
+		integrator->motion_blur = r.use_motion_blur();
 	}
-
-	integrator->motion_blur = (!preview && r.use_motion_blur());
 #endif
 
 	integrator->diffuse_samples = get_int(cscene, "diffuse_samples");