diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-02-16 22:24:04 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-02-16 22:24:04 +0300 |
| commit | ad01c90ee3942fb2a4a792f0454a136b441f42b4 (patch) | |
| tree | f0468981d9f46ae32b386d36ab34d1d9bbda9a2f /source/blender/makesdna/DNA_image_types.h | |
| parent | a4c010975a6afaecc2ca8f8284de3febda113369 (diff) | |
Revert render slots commit for release, I can't find the bug or even redo
it myself, there will still be render slots just old implementation.
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 5aed1d0c2d0..3a7933cf425 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -72,12 +72,9 @@ typedef struct Image { /* sources from: */ struct anim *anim; struct RenderResult *rr; - - struct RenderResult *renders[8]; /* IMA_MAX_RENDER_SLOT */ - short render_slot, last_render_slot; short ok, flag; - short source, type; + short source, type, pad, pad1; int lastframe; /* texture page */ @@ -90,13 +87,14 @@ typedef struct Image { struct PackedFile * packedfile; struct PreviewImage * preview; - /* game engine tile animation */ + /* not saved in file, statistics for render result */ + char *render_text; + float lastupdate; int lastused; short animspeed; - /* for generated images */ - short gen_x, gen_y, gen_type; + short gen_x, gen_y, gen_type; /* for generated images */ /* display aspect - for UV editing images resized for faster openGL display */ float aspx, aspy; @@ -126,9 +124,9 @@ typedef struct Image { /* ima->type and ima->source moved to BKE_image.h, for API */ -/* render */ -#define IMA_MAX_RENDER_TEXT 512 -#define IMA_MAX_RENDER_SLOT 8 +/* render_text maxlen */ +#define IMA_RW_MAXTEXT 512 + #endif |