merge from trunk r37405
[blender.git] / source / blender / makesdna / DNA_scene_types.h
index c6fa07482c5936cd1369654cc439734b34d1016d..c9440fad6c7ba894e6074a55b51f790852475a62 100644 (file)
@@ -998,14 +998,13 @@ 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