diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-11-12 16:30:02 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-11-12 16:30:02 +0400 |
| commit | 6b65102c20e9bdafd90f55f60c2a2084d873e809 (patch) | |
| tree | a0f5554702501d2da1073b22ff55f740aff135f9 /intern/cycles/render/camera.h | |
| parent | 053710fcbc78ff83b9617be87558876e381f85a6 (diff) | |
| parent | 83de5cb30831328548502126dff84ffdb72544f2 (diff) | |
Merge w/ trunk: r51141-52085 (Important Note: gameengine and blenderplayer were not merged due to complex differences)
Diffstat (limited to 'intern/cycles/render/camera.h')
| -rw-r--r-- | intern/cycles/render/camera.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/render/camera.h b/intern/cycles/render/camera.h index 82852bde5e0..4c2de7b50b8 100644 --- a/intern/cycles/render/camera.h +++ b/intern/cycles/render/camera.h @@ -21,6 +21,7 @@ #include "kernel_types.h" +#include "util_boundbox.h" #include "util_transform.h" #include "util_types.h" @@ -65,10 +66,10 @@ public: /* screen */ int width, height; - float left, right, bottom, top; + BoundBox2D viewplane; /* border */ - float border_left, border_right, border_bottom, border_top; + BoundBox2D border; /* transformation */ Transform matrix; @@ -103,6 +104,7 @@ public: void device_free(Device *device, DeviceScene *dscene); bool modified(const Camera& cam); + bool motion_modified(const Camera& cam); void tag_update(); }; |