merged changes to revision 24446

[blender.git] / source / blender / makesdna / DNA_scene_types.h

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 330546253798fe8f104f5901ca3f887ed1d4c7e2..8554ddf7aa30fbcad81b27bd6a3b2ad303b767b2 100644 (file)
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -196,7 +196,8 @@ typedef struct RenderData {
        float edgeR, edgeG, edgeB;
        
        short fullscreen, xplay, yplay, freqplay;       /* standalone player */  //  XXX deprecated since 2.5
-       short depth, attrib, rt1, rt2;                  /* standalone player */  //  XXX deprecated since 2.5
+       short depth, attrib, rt2;                       /* standalone player */  //  XXX deprecated since 2.5
+       short frame_step;               /* frames to jump during render/playback */
 
        short stereomode;       /* standalone player stereo settings */  //  XXX deprecated since 2.5
        
@@ -743,10 +744,8 @@ typedef struct Scene {
        short recalc;                           /* recalc = counterpart of ob->recalc */
 
        short jumpframe;
+       int pad5;
 
-       /* frame step. */
-       int frame_step;
-       
        /* User-Defined KeyingSets */
        int active_keyingset;                   /* index of the active KeyingSet. first KeyingSet has index 1, 'none' active is 0, 'add new' is -1 */
        ListBase keyingsets;                    /* KeyingSets for the given frame */