Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/render/camera.cpp')
-rw-r--r--intern/cycles/render/camera.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp
index 441f17d90e9..727b9801d95 100644
--- a/intern/cycles/render/camera.cpp
+++ b/intern/cycles/render/camera.cpp
@@ -19,6 +19,8 @@
#include "camera.h"
#include "scene.h"
+#include "device.h"
+
#include "util_vector.h"
CCL_NAMESPACE_BEGIN
@@ -141,7 +143,7 @@ void Camera::update()
void Camera::device_update(Device *device, DeviceScene *dscene, Scene *scene)
{
- Scene::MotionType need_motion = scene->need_motion();
+ Scene::MotionType need_motion = scene->need_motion(device->info.advanced_shading);
update();
@@ -274,13 +276,17 @@ bool Camera::modified(const Camera& cam)
(border_bottom == cam.border_bottom) &&
(border_top == cam.border_top) &&
(matrix == cam.matrix) &&
- (motion == cam.motion) &&
- (use_motion == cam.use_motion) &&
(panorama_type == cam.panorama_type) &&
(fisheye_fov == cam.fisheye_fov) &&
(fisheye_lens == cam.fisheye_lens));
}
+bool Camera::motion_modified(const Camera& cam)
+{
+ return !((motion == cam.motion) &&
+ (use_motion == cam.use_motion));
+}
+
void Camera::tag_update()
{
need_update = true;