svn merge -r 37212:37306 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / makesdna / DNA_scene_types.h
index fb9b4f01b97ca160a860af872e63479c51fa82ef..ccc306e777b4276680ce8c5d8326a538579bba0e 100644 (file)
@@ -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