diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-15 07:42:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-15 07:42:28 +0400 |
| commit | 99b7960781391b52ddff639420cf74cab0418647 (patch) | |
| tree | b8da20754772e4e7557fafd76100a3c3d61c1f36 /source/blender/makesdna/DNA_view3d_types.h | |
| parent | 36bec40fbcf036acccb3e0541f5328a3266c7010 (diff) | |
remove some unused view3d members & added RV3D_VIEW_USER define.
Aligorith: replaced v3d->keyflags with ANIMFILTER_KEYS_LOCAL since v3d->keyflags couldn't be set anywhere and wasn't initialized.
Diffstat (limited to 'source/blender/makesdna/DNA_view3d_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index e76cd4b07d6..60fa48d9717 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -163,26 +163,21 @@ typedef struct View3D { * OB_SHADED or OB_TEXTURE */ short drawtype; short ob_centre_cursor; /* optional bool for 3d cursor to define center */ - short scenelock, around, pad3; + short scenelock, around; short flag, flag2; - short pivot_last; /* pivot_last is for rotating around the last edited element */ - float lens, grid; - float gridview; /* XXX deprecated, now in RegionView3D */ float near, far; float ofs[3]; /* XXX deprecated */ float cursor[3]; - short gridlines, pad4; - short gridflag; - short gridsubdiv; /* Number of subdivisions in the grid between each highlighted grid line */ short modeselect; - short keyflags; /* flags for display of keyframes */ - + short gridlines; + short gridsubdiv; /* Number of subdivisions in the grid between each highlighted grid line */ + char gridflag; + /* transform widget info */ - short twtype, twmode, twflag; - short twdrawflag; /* XXX deprecated */ + char twtype, twmode, twflag, pad2[2]; /* afterdraw, for xray & transparent */ struct ListBase afterdraw_transp; @@ -195,7 +190,7 @@ typedef struct View3D { char ndofmode; /* mode of transform for 6DOF devices -1 not found, 0 normal, 1 fly, 2 ob transform */ char ndoffilter; /* filter for 6DOF devices 0 normal, 1 dominant */ - void *properties_storage; /* Nkey panel stores stuff here, not in file */ + void *properties_storage; /* Nkey panel stores stuff here (runtime only!) */ /* XXX depricated? */ struct bGPdata *gpd; /* Grease-Pencil Data (annotation layers) */ @@ -231,10 +226,11 @@ typedef struct View3D { #define RV3D_BOXCLIP 4 /* RegionView3d->view */ -#define RV3D_VIEW_FRONT 1 +#define RV3D_VIEW_USER 0 +#define RV3D_VIEW_FRONT 1 #define RV3D_VIEW_BACK 2 #define RV3D_VIEW_LEFT 3 -#define RV3D_VIEW_RIGHT 4 +#define RV3D_VIEW_RIGHT 4 #define RV3D_VIEW_TOP 5 #define RV3D_VIEW_BOTTOM 6 #define RV3D_VIEW_PERSPORTHO 7 |