diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-12 21:56:52 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-13 01:57:14 +0300 |
| commit | 5cf032678ff969688b6eefb8db6b241ac8934860 (patch) | |
| tree | 8020097cbddbe6dc8111e8960cc649e83f01754a /intern/cycles/render/camera.cpp | |
| parent | a33a5880f7af985a2418e87c2debed8130bf96d4 (diff) | |
Code cleanup: remove test code to disable motion blur, no longer useful.
Diffstat (limited to 'intern/cycles/render/camera.cpp')
| -rw-r--r-- | intern/cycles/render/camera.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp index b6757d80afd..67c100564c2 100644 --- a/intern/cycles/render/camera.cpp +++ b/intern/cycles/render/camera.cpp @@ -306,7 +306,7 @@ void Camera::update() void Camera::device_update(Device *device, DeviceScene *dscene, Scene *scene) { - Scene::MotionType need_motion = scene->need_motion(device->info.advanced_shading); + Scene::MotionType need_motion = scene->need_motion(); update(); @@ -359,7 +359,6 @@ void Camera::device_update(Device *device, DeviceScene *dscene, Scene *scene) } } } -#ifdef __CAMERA_MOTION__ else if(need_motion == Scene::MOTION_BLUR) { if(use_motion) { transform_motion_decompose(&kcam->motion, &motion, &matrix); @@ -370,7 +369,6 @@ void Camera::device_update(Device *device, DeviceScene *dscene, Scene *scene) kcam->have_perspective_motion = 1; } } -#endif /* depth of field */ kcam->aperturesize = aperturesize; @@ -379,7 +377,6 @@ void Camera::device_update(Device *device, DeviceScene *dscene, Scene *scene) kcam->bladesrotation = bladesrotation; /* motion blur */ -#ifdef __CAMERA_MOTION__ kcam->shuttertime = (need_motion == Scene::MOTION_BLUR) ? shuttertime: -1.0f; scene->lookup_tables->remove_table(&shutter_table_offset); @@ -395,9 +392,6 @@ void Camera::device_update(Device *device, DeviceScene *dscene, Scene *scene) shutter_table); kcam->shutter_table_offset = (int)shutter_table_offset; } -#else - kcam->shuttertime = -1.0f; -#endif /* type */ kcam->type = type; |