diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-03-21 20:37:24 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-03-21 20:37:24 +0300 |
| commit | c49316a9eb730f21094d795329c468d51f5ba1b5 (patch) | |
| tree | d916cb23789a847cc7579d3193b37932a60fd017 /source/blender/makesdna | |
| parent | d3116dd4d2d25121d206b69ecfeee7d296848642 (diff) | |
Bugfix: don't do full sample merging on re-rendered layers in
the compositor.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index f31f9fff142..54a37d54e20 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -225,10 +225,12 @@ typedef struct RenderData { short bufflag; short quality; + short rpad; + /** * Flags for render settings. Use bit-masking to access the settings. */ - short scemode; + int scemode; /** * Flags for render settings. Use bit-masking to access the settings. @@ -236,7 +238,7 @@ typedef struct RenderData { int mode; /* render engine, octree resolution */ - short renderer, ocres, rpad[2]; + short renderer, ocres; /** * What to do with the sky/background. Picks sky/premul/key @@ -608,7 +610,7 @@ typedef struct Scene { #define R_INTERN 0 #define R_YAFRAY 1 -/* scemode */ +/* scemode (int now) */ #define R_DOSEQ 0x0001 #define R_BG_RENDER 0x0002 /* passepartout is camera option now, keep this for backward compatibility */ @@ -626,6 +628,7 @@ typedef struct Scene { #define R_NO_TEX 0x2000 #define R_STAMP_INFO 0x4000 #define R_FULL_SAMPLE 0x8000 +#define R_COMP_RERENDER 0x10000 /* r->stamp */ #define R_STAMP_TIME 0x0001 |