merge from trunk r37405
[blender.git] / source / blender / makesdna / DNA_scene_types.h
index 657bfb1c884885bde80df844f466d9ab6be830f8..c9440fad6c7ba894e6074a55b51f790852475a62 100644 (file)
@@ -253,19 +253,12 @@ typedef struct RenderData {
         */
        short yparts;
         
-       short winpos, planes, imtype, subimtype;
-       
-       /** Mode bits:                                                           */
-       /* 0: Enable backbuffering for images                                    */
-       short bufflag;
-        short quality;
+       short planes, imtype, subimtype, quality;
        
        /**
         * Render to image editor, fullscreen or to new window.
         */
        short displaymode;
-       
-       short rpad1, rpad2;
 
        /**
         * Flags for render settings. Use bit-masking to access the settings.
@@ -322,11 +315,7 @@ typedef struct RenderData {
        /**
         * Adjustment factors for the aspect ratio in the x direction, was a short in 2.45
         */
-       float xasp;
-       /**
-        * Adjustment factors for the aspect ratio in the x direction, was a short in 2.45
-        */
-       float yasp;
+       float xasp, yasp;
 
        float frs_sec_base;
        
@@ -349,8 +338,8 @@ typedef struct RenderData {
        short bake_normal_space, bake_quad_split;
        float bake_maxdist, bake_biasdist, bake_pad;
 
-       /* paths to backbufffer, output */
-       char backbuf[160], pic[160];
+       /* path to render output */
+       char pic[240];
 
        /* stamps flags. */
        int stamp;