diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-27 18:35:34 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-27 18:35:34 +0300 |
| commit | 57101c4fd26a85f4994d4d4d3f433c37f95367d0 (patch) | |
| tree | 09d40feb19a41df0f32a05ff1975653f865b743e /source/blender/makesdna | |
| parent | 17777e7cd195318c36a1172647557447330dd3a4 (diff) | |
Second attempt at committing the different render slot implementation. This
has a fix that hopefully solves the problem on mac/win. Also fixes #21322,
render slots not working well with FSA.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 3a7933cf425..5aed1d0c2d0 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -72,9 +72,12 @@ 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, pad, pad1; + short source, type; int lastframe; /* texture page */ @@ -87,14 +90,13 @@ typedef struct Image { struct PackedFile * packedfile; struct PreviewImage * preview; - /* not saved in file, statistics for render result */ - char *render_text; - + /* game engine tile animation */ float lastupdate; int lastused; short animspeed; - short gen_x, gen_y, gen_type; /* for generated images */ + /* for generated images */ + short gen_x, gen_y, gen_type; /* display aspect - for UV editing images resized for faster openGL display */ float aspx, aspy; @@ -124,9 +126,9 @@ typedef struct Image { /* ima->type and ima->source moved to BKE_image.h, for API */ -/* render_text maxlen */ -#define IMA_RW_MAXTEXT 512 - +/* render */ +#define IMA_MAX_RENDER_TEXT 512 +#define IMA_MAX_RENDER_SLOT 8 #endif |