diff options
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_camera_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 7 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 23 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 8 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 26 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 11 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_world_types.h | 2 |
9 files changed, 33 insertions, 51 deletions
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index 3a9c7b22cde..11c8533783e 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -78,7 +78,7 @@ typedef struct Camera { #define CAM_PANORAMA 128 /* yafray: dof sampling switch */ -#define CAM_YF_NO_QMC 512 +/* #define CAM_YF_NO_QMC 512 */ /* depreceated */ #ifdef __cplusplus diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 6d92b1d09a5..d1dcd2dd29c 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -321,8 +321,7 @@ extern Object workob; /* (short) transflag */ #define OB_OFFS_LOCAL 1 - // XXX OB_QUAT was never used, but is now depreceated in favour of standard rotation handling... -#define OB_QUAT 2 +/* #define OB_QUAT 2 */ /* never used, free flag */ #define OB_NEG_SCALE 4 #define OB_DUPLI (8+16+256+512+2048) #define OB_DUPLIFRAMES 8 @@ -401,7 +400,7 @@ extern Object workob; #define OB_BOUND_CONE 3 #define OB_BOUND_POLYH 4 #define OB_BOUND_POLYT 5 -#define OB_BOUND_DYN_MESH 6 +/* #define OB_BOUND_DYN_MESH 6 */ /*UNUSED*/ #define OB_BOUND_CAPSULE 7 @@ -476,7 +475,7 @@ extern Object workob; #define OB_LOCK_RIGID_BODY_Y_ROT_AXIS 64 #define OB_LOCK_RIGID_BODY_Z_ROT_AXIS 128 -#define OB_LIFE (OB_PROP|OB_DYNAMIC|OB_ACTOR|OB_MAINACTOR|OB_CHILD) +/* #define OB_LIFE (OB_PROP|OB_DYNAMIC|OB_ACTOR|OB_MAINACTOR|OB_CHILD) */ /* ob->body_type */ #define OB_BODY_TYPE_NO_COLLISION 0 diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 93fe0f0b4e5..141a38470db 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -832,12 +832,6 @@ typedef struct Scene { /* **************** RENDERDATA ********************* */ -/* bufflag */ -#define R_BACKBUF 1 -#define R_BACKBUFANIM 2 -#define R_FRONTBUF 4 -#define R_FRONTBUFANIM 8 - /* flag */ /* use preview range */ #define SCER_PRV_RANGE (1<<0) @@ -855,7 +849,7 @@ typedef struct Scene { #define R_BORDER 0x0200 #define R_PANORAMA 0x0400 /* deprecated as scene option, still used in renderer */ #define R_CROP 0x0800 -#define R_COSMO 0x1000 +/*#define R_COSMO 0x1000 deprecated */ #define R_ODDFIELD 0x2000 #define R_MBLUR 0x4000 /* unified was here */ @@ -863,7 +857,7 @@ typedef struct Scene { /* R_GAUSS is obsolete, but used to retrieve setting from old files */ #define R_GAUSS 0x20000 /* fbuf obsolete... */ -#define R_FBUF 0x40000 +/*#define R_FBUF 0x40000*/ /* threads obsolete... is there for old files, now use for autodetect threads */ #define R_THREADS 0x80000 /* Use the same flag for autothreads */ @@ -884,7 +878,7 @@ typedef struct Scene { #define R_OUTPUT_SCREEN 0 #define R_OUTPUT_AREA 1 #define R_OUTPUT_WINDOW 2 -#define R_OUTPUT_FORKED 3 +/*#define R_OUTPUT_FORKED 3*/ /* filtertype */ #define R_FILTER_BOX 0 @@ -928,10 +922,10 @@ typedef struct Scene { #define R_COMP_FREE 0x0800 #define R_NO_IMAGE_LOAD 0x1000 #define R_NO_TEX 0x2000 -#define R_STAMP_INFO 0x4000 /* deprecated */ +/*#define R_STAMP_INFO 0x4000 deprecated */ #define R_FULL_SAMPLE 0x8000 -#define R_DEPRECATED 0x10000 -#define R_RECURS_PROTECTION 0x20000 +/* #define R_DEPRECATED 0x10000 */ +/* #define R_RECURS_PROTECTION 0x20000 */ #define R_TEXNODE_PREVIEW 0x40000 /* r->stamp */ @@ -968,7 +962,7 @@ typedef struct Scene { /* #define R_HAMX 2 */ /* hamx is nomore */ /* #define R_FTYPE 3 */ /* ftype is nomore */ #define R_JPEG90 4 -#define R_MOVIE 5 +/*#define R_MOVIE 5*/ /* movie is nomore */ #define R_IRIZ 7 #define R_RAWTGA 14 #define R_AVIRAW 15 @@ -1054,7 +1048,6 @@ typedef struct Scene { #define ID_NEW_US2(a) if( ((ID *)a)->newid) {(a)= ((ID *)a)->newid; ((ID *)a)->us++;} #define CFRA (scene->r.cfra) #define SUBFRA (scene->r.subframe) -#define F_CFRA ((float)(scene->r.cfra)) #define SFRA (scene->r.sfra) #define EFRA (scene->r.efra) #define PRVRANGEON (scene->r.flag & SCER_PRV_RANGE) @@ -1206,7 +1199,7 @@ typedef enum SculptFlags { #define PE_DEFLECT_EMITTER 4 #define PE_INTERPOLATE_ADDED 8 #define PE_DRAW_PART 16 -#define PE_X_MIRROR 64 /* deprecated */ +/* #define PE_X_MIRROR 64 */ /* deprecated */ #define PE_FADE_TIME 128 #define PE_AUTO_VELOCITY 256 diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 2d3af55ca78..606c69e693e 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -196,12 +196,12 @@ typedef struct ARegion { /* Panel->snap - for snapping to screen edges */ #define PNL_SNAP_NONE 0 -#define PNL_SNAP_TOP 1 -#define PNL_SNAP_RIGHT 2 +/* #define PNL_SNAP_TOP 1 */ +/* #define PNL_SNAP_RIGHT 2 */ #define PNL_SNAP_BOTTOM 4 -#define PNL_SNAP_LEFT 8 +/* #define PNL_SNAP_LEFT 8 */ -#define PNL_SNAP_DIST 9.0 +/* #define PNL_SNAP_DIST 9.0 */ /* paneltype flag */ #define PNL_DEFAULT_CLOSED 1 diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 9303394f149..4fcf7bd6250 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -232,6 +232,8 @@ typedef struct SpeedControlVars { int lastValidFrame; } SpeedControlVars; +#define SELECT 1 + /* Editor->over_flag */ #define SEQ_EDIT_OVERLAY_SHOW 1 #define SEQ_EDIT_OVERLAY_ABS 2 diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 271e616cf10..0d388066cf2 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -340,9 +340,6 @@ typedef struct Script { char scriptarg[256]; } Script; #define SCRIPT_SET_NULL(_script) _script->py_draw = _script->py_event = _script->py_button = _script->py_browsercallback = _script->py_globaldict = NULL; _script->flags = 0; -#define SCRIPT_RUNNING 0x01 -#define SCRIPT_GUI 0x02 -#define SCRIPT_FILESEL 0x04 typedef struct SpaceScript { SpaceLink *next, *prev; diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index cdb52c83b0a..6840da9638d 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -49,7 +49,7 @@ struct ColorBand; /* default uifont_id offered by Blender */ #define UIFONT_DEFAULT 0 -#define UIFONT_BITMAP 1 +/*#define UIFONT_BITMAP 1*/ /*UNUSED*/ /* free slots */ #define UIFONT_CUSTOM1 2 #define UIFONT_CUSTOM2 3 @@ -405,16 +405,16 @@ extern UserDef U; /* from blenkernel blender.c */ /* flag */ #define USER_AUTOSAVE (1 << 0) -#define USER_AUTOGRABGRID (1 << 1) /* deprecated */ -#define USER_AUTOROTGRID (1 << 2) /* deprecated */ -#define USER_AUTOSIZEGRID (1 << 3) /* deprecated */ +/*#define USER_AUTOGRABGRID (1 << 1) deprecated */ +/*#define USER_AUTOROTGRID (1 << 2) deprecated */ +/*#define USER_AUTOSIZEGRID (1 << 3) deprecated */ #define USER_SCENEGLOBAL (1 << 4) #define USER_TRACKBALL (1 << 5) -#define USER_DUPLILINK (1 << 6) -#define USER_FSCOLLUM (1 << 7) +/*#define USER_DUPLILINK (1 << 6) deprecated */ +/*#define USER_FSCOLLUM (1 << 7) deprecated */ #define USER_MAT_ON_OB (1 << 8) /*#define USER_NO_CAPSLOCK (1 << 9)*/ /* not used anywhere */ -#define USER_VIEWMOVE (1 << 10) +/*#define USER_VIEWMOVE (1 << 10)*/ /* not used anywhere */ #define USER_TOOLTIPS (1 << 11) #define USER_TWOBUTTONMOUSE (1 << 12) #define USER_NONUMPAD (1 << 13) @@ -452,10 +452,10 @@ extern UserDef U; /* from blenkernel blender.c */ #define USER_DRAWVIEWINFO (1 << 4) #define USER_PLAINMENUS (1 << 5) // old EVTTOCONSOLE print ghost events, here for tuhopuu compat. --phase // old flag for hide pulldown was here -#define USER_FLIPFULLSCREEN (1 << 7) +/*#define USER_FLIPFULLSCREEN (1 << 7)*/ /* deprecated */ #define USER_ALLWINCODECS (1 << 8) #define USER_MENUOPENAUTO (1 << 9) -#define USER_PANELPINNED (1 << 10) /* deprecated */ +/*#define USER_PANELPINNED (1 << 10) deprecated */ #define USER_AUTOPERSP (1 << 11) #define USER_LOCKAROUND (1 << 12) #define USER_GLOBALUNDO (1 << 13) @@ -501,11 +501,11 @@ extern UserDef U; /* from blenkernel blender.c */ #define USER_TR_TOOLTIPS (1 << 0) #define USER_TR_BUTTONS (1 << 1) #define USER_TR_MENUS (1 << 2) -#define USER_TR_FILESELECT (1 << 3) -#define USER_TR_TEXTEDIT (1 << 4) +/*#define USER_TR_FILESELECT (1 << 3) deprecated*/ +/*#define USER_TR_TEXTEDIT (1 << 4) deprecated*/ #define USER_DOTRANSLATE (1 << 5) #define USER_USETEXTUREFONT (1 << 6) -#define CONVERT_TO_UTF8 (1 << 7) +/*#define CONVERT_TO_UTF8 (1 << 7) deprecated*/ /* dupflag */ #define USER_DUP_MESH (1 << 0) @@ -522,7 +522,7 @@ extern UserDef U; /* from blenkernel blender.c */ #define USER_DUP_PSYS (1 << 11) /* gameflags */ -#define USER_DEPRECATED_FLAG 1 +// #define USER_DEPRECATED_FLAG 1 // #define USER_DISABLE_SOUND 2 deprecated, don't use without checking for // backwards compatibilty in do_versions! #define USER_DISABLE_MIPMAP 4 diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 24427195888..ab3ca025ed5 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -208,16 +208,7 @@ typedef struct View3D { #define V3D_DISPBGPICS 2 #define V3D_HIDE_HELPLINES 4 #define V3D_INVALID_BACKBUF 8 -/* deprecated */ -/* -#define V3D_MODE (16+32+64+128+256+512) -#define V3D_EDITMODE 16 -#define V3D_VERTEXPAINT 32 -#define V3D_FACESELECT 64 -#define V3D_POSEMODE 128 -#define V3D_TEXTUREPAINT 256 -#define V3D_WEIGHTPAINT 512 -*/ + #define V3D_ALIGN 1024 #define V3D_SELECT_OUTLINE 2048 #define V3D_ZBUF_SELECT 4096 diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index 42c80f4b8b5..68b3c32db97 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -140,7 +140,7 @@ typedef struct World { /* mode */ #define WO_MIST 1 #define WO_STARS 2 -#define WO_DOF 4 +/*#define WO_DOF 4*/ #define WO_ACTIVITY_CULLING 8 #define WO_ENV_LIGHT 16 #define WO_DBVT_CULLING 32 |