Merged changes in the trunk up to revision 36408.
[blender.git] / source / blender / render / intern / include / render_types.h
index 4eeed1b44dc8df80bd9d2eb94b6fa77cecb58f90..c0b40b325870aa030da60f6a2d6a7b21fdbedb0b 100644 (file)
@@ -182,6 +182,7 @@ struct Render
        Scene *scene;
        RenderData r;
        World wrld;
+       struct Object *camera_override;
        unsigned int lay;
        
        ListBase parts;
@@ -487,6 +488,7 @@ typedef struct VolPrecachePart
        float bbmin[3];
        float voxel[3];
        int working, done;
+       struct Render *re;
 } VolPrecachePart;
 
 typedef struct VolumePrecache