diff options
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index f26b1d5535d..9dc4480fc35 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -318,10 +318,11 @@ typedef struct ImageFormatData { /* return values from BKE_imtype_valid_depths, note this is depts per channel */ #define R_IMF_CHAN_DEPTH_1 (1<<0) /* 1bits (unused) */ #define R_IMF_CHAN_DEPTH_8 (1<<1) /* 8bits (default) */ -#define R_IMF_CHAN_DEPTH_12 (1<<2) /* 12bits (uncommon, jp2 supports) */ -#define R_IMF_CHAN_DEPTH_16 (1<<3) /* 16bits (tiff, halff float exr) */ -#define R_IMF_CHAN_DEPTH_24 (1<<4) /* 24bits (unused) */ -#define R_IMF_CHAN_DEPTH_32 (1<<5) /* 32bits (full float exr) */ +#define R_IMF_CHAN_DEPTH_10 (1<<2) /* 10bits (uncommon, Cineon/DPX support) */ +#define R_IMF_CHAN_DEPTH_12 (1<<3) /* 12bits (uncommon, jp2/DPX support) */ +#define R_IMF_CHAN_DEPTH_16 (1<<4) /* 16bits (tiff, halff float exr) */ +#define R_IMF_CHAN_DEPTH_24 (1<<5) /* 24bits (unused) */ +#define R_IMF_CHAN_DEPTH_32 (1<<6) /* 32bits (full float exr) */ /* ImageFormatData.planes */ #define R_IMF_PLANES_RGB 24 @@ -395,11 +396,16 @@ typedef struct RenderData { /** * The number of part to use in the x direction */ - short xparts; + short xparts DNA_DEPRECATED; /** * The number of part to use in the y direction */ - short yparts; + short yparts DNA_DEPRECATED; + + /** + * render tile dimensions + */ + short tilex, tiley; short planes DNA_DEPRECATED, imtype DNA_DEPRECATED, subimtype DNA_DEPRECATED, quality DNA_DEPRECATED; /*deprecated!*/ @@ -447,6 +453,8 @@ typedef struct RenderData { short frs_sec, edgeint; + int pad; + /* safety, border and display rect */ rctf safety, border; @@ -475,7 +483,7 @@ typedef struct RenderData { int color_mgt_flag; /** post-production settings. deprecated, but here for upwards compat (initialized to 1) */ - float postgamma, posthue, postsat; + float postgamma, posthue, postsat; /* Dither noise intensity */ float dither_intensity; @@ -1094,7 +1102,7 @@ typedef struct Scene { short use_nodes; - struct bNodeTree *nodetree; + struct bNodeTree *nodetree; struct Editing *ed; /* sequence editor data is allocated here */ @@ -1187,15 +1195,16 @@ typedef struct Scene { /* Use the same flag for autothreads */ #define R_FIXED_THREADS 0x80000 -#define R_SPEED 0x100000 -#define R_SSS 0x200000 -#define R_NO_OVERWRITE 0x400000 /* skip existing files */ -#define R_TOUCH 0x800000 /* touch files before rendering */ -#define R_SIMPLIFY 0x1000000 +#define R_SPEED 0x100000 +#define R_SSS 0x200000 +#define R_NO_OVERWRITE 0x400000 /* skip existing files */ +#define R_TOUCH 0x800000 /* touch files before rendering */ +#define R_SIMPLIFY 0x1000000 +#define R_PERSISTENT_DATA 0x2000000 /* keep data around for re-render */ /* seq_flag */ #define R_SEQ_GL_PREV 1 -#define R_SEQ_GL_REND 2 +// #define R_SEQ_GL_REND 2 // UNUSED, opengl render has its own operator now. /* displaymode */ @@ -1309,6 +1318,7 @@ typedef struct Scene { /* sequencer seq_prev_type seq_rend_type */ + /* **************** SCENE ********************* */ /* for general use */ @@ -1361,8 +1371,8 @@ typedef struct Scene { #define SFRA (scene->r.sfra) #define EFRA (scene->r.efra) #define PRVRANGEON (scene->r.flag & SCER_PRV_RANGE) -#define PSFRA ((PRVRANGEON)? (scene->r.psfra): (scene->r.sfra)) -#define PEFRA ((PRVRANGEON)? (scene->r.pefra): (scene->r.efra)) +#define PSFRA ((PRVRANGEON) ? (scene->r.psfra) : (scene->r.sfra)) +#define PEFRA ((PRVRANGEON) ? (scene->r.pefra) : (scene->r.efra)) #define FRA2TIME(a) ((((double) scene->r.frs_sec_base) * (double)(a)) / (double)scene->r.frs_sec) #define TIME2FRA(a) ((((double) scene->r.frs_sec) * (double)(a)) / (double)scene->r.frs_sec_base) #define FPS (((double) scene->r.frs_sec) / (double)scene->r.frs_sec_base) @@ -1460,6 +1470,7 @@ typedef enum SculptFlags { SCULPT_SYMMETRY_FEATHER = (1<<6), SCULPT_USE_OPENMP = (1<<7), SCULPT_ONLY_DEFORM = (1<<8), + SCULPT_SHOW_DIFFUSE = (1<<9), } SculptFlags; /* ImagePaintSettings.flag */ |