Merging r50049 through r50076 from trunk into soc-2011-tomato
[blender.git] / intern / cycles / render / camera.h
index 647423d88baf8bfc2a282d69134fd48f7294efd5..a539510029f7d26ffbcbb1fc8e940b575ea54261 100644 (file)
@@ -78,7 +78,7 @@ public:
        bool use_motion;
 
        /* computed camera parameters */
-    Transform screentoworld;
+       Transform screentoworld;
        Transform rastertoworld;
        Transform ndctoworld;
        Transform rastertocamera;
@@ -91,6 +91,7 @@ public:
        /* update */
        bool need_update;
        bool need_device_update;
+       int previous_motion;
 
        /* functions */
        Camera();