diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-16 01:12:58 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-16 01:12:58 +0400 |
| commit | fe16b2620646708bae3286b9c1300eacbc4bc0da (patch) | |
| tree | 5c3b225d1e23f3797cca638649f014662031825e /intern/cycles/render/scene.cpp | |
| parent | 8a25e2d2b2214db32b1a337253f337b63eafdef3 (diff) | |
Cycles: fix some update issues with camera motion blur, and do some more work
for getting object motion blur ready.
Diffstat (limited to 'intern/cycles/render/scene.cpp')
| -rw-r--r-- | intern/cycles/render/scene.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |