From fe16b2620646708bae3286b9c1300eacbc4bc0da Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 15 Oct 2012 21:12:58 +0000 Subject: Cycles: fix some update issues with camera motion blur, and do some more work for getting object motion blur ready. --- intern/cycles/render/scene.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/cycles/render/scene.cpp') diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index 071338d49c2..15031b9500c 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -183,10 +183,10 @@ void Scene::device_update(Device *device_, Progress& progress) device->const_copy_to("__data", &dscene.data, sizeof(dscene.data)); } -Scene::MotionType Scene::need_motion() +Scene::MotionType Scene::need_motion(bool advanced_shading) { if(integrator->motion_blur) - return MOTION_BLUR; + return (advanced_shading)? MOTION_BLUR: MOTION_NONE; else if(Pass::contains(film->passes, PASS_MOTION)) return MOTION_PASS; else -- cgit v1.2.3