diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-11 13:44:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-11 13:44:46 +0300 |
| commit | 2e3326c1533e992ef7eaa43ed876375af4db5de1 (patch) | |
| tree | fe0adcbf314053bd3c079abd4692dea851231aac /source/blender/makesdna/DNA_scene_types.h | |
| parent | 7fe52eedba00a3008d56ad0d689ed27fcf658220 (diff) | |
| parent | e4f10565ea6b4a9015bd5a9e81b77d1d549e9b46 (diff) | |
Sculpt: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24330:24483
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 810b34a746e..037a8c46222 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -191,7 +191,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 @@ -738,10 +739,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 */ |