diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2011-06-08 01:20:25 +0400 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2011-06-08 01:20:25 +0400 |
commit | b5bd86e5907c3fa98546dabeda9703dfb15862f4 (patch) | |
tree | eb65895e557f820fca0931c8465571ed0e749860 /source/blender/makesdna/DNA_scene_types.h | |
parent | 9de407f13f2e628f67dbcda252febebac6307293 (diff) | |
parent | 7fd1fe9fc8e3154c36a57ed2c69409d526ee1171 (diff) |
svn merge -r 37212:37306 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index fb9b4f01b97..ccc306e777b 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1036,13 +1036,14 @@ typedef struct Scene { #define R_JPEG2K_CINE_PRESET 256 #define R_JPEG2K_CINE_48FPS 512 - /* bake_mode: same as RE_BAKE_xxx defines */ /* bake_flag: */ #define R_BAKE_CLEAR 1 #define R_BAKE_OSA 2 #define R_BAKE_TO_ACTIVE 4 #define R_BAKE_NORMALIZE 8 +#define R_BAKE_MULTIRES 16 +#define R_BAKE_LORES_MESH 32 /* bake_normal_space */ #define R_BAKE_SPACE_CAMERA 0 |