diff options
Diffstat (limited to 'source/blender/makesdna/DNA_view3d_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index c83b0bc366f..294c47aa9db 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -46,6 +46,7 @@ struct RenderEngine; struct bGPdata; struct SmoothView3DStore; struct wmTimer; +struct Material; /* This is needed to not let VC choke on near and far... old * proprietary MS extensions... */ @@ -106,6 +107,7 @@ typedef struct RegionView3D { struct RenderInfo *ri; struct RenderEngine *render_engine; struct ViewDepths *depths; + void *gpuoffscreen; /* animated smooth view */ struct SmoothView3DStore *sms; @@ -117,7 +119,6 @@ typedef struct RegionView3D { float viewquat[4]; /* view rotation, must be kept normalized */ float dist; /* distance from 'ofs' along -viewinv[2] vector, where result is negative as is 'ofs' */ - float zfac; /* initgrabz() result */ float camdx, camdy; /* camera view offsets, 1.0 = viewplane moves entire width/height */ float pixsize; /* runtime only */ float ofs[3]; /* view center & orbit pivot, negative of worldspace location, @@ -128,10 +129,11 @@ typedef struct RegionView3D { char persp; char view; char viewlock; + char pad[4]; short twdrawflag; short rflag; - + /* last view (use when switching out of camera view) */ float lviewquat[4]; @@ -160,8 +162,8 @@ typedef struct View3D { float bundle_size; /* size of bundles in reconstructed data */ short bundle_drawtype; /* display style for bundle */ - - char pad[6]; + short pad; + int matcap_icon; /* icon id */ unsigned int lay_used; /* used while drawing */ @@ -209,11 +211,11 @@ typedef struct View3D { /* drawflags, denoting state */ short zbuf, transp, xray; - char pad3[2]; - void *properties_storage; /* Nkey panel stores stuff here (runtime only!) */ - + void *properties_storage; /* Nkey panel stores stuff here (runtime only!) */ + struct Material *defmaterial; /* used by matcap now */ + /* XXX deprecated? */ struct bGPdata *gpd DNA_DEPRECATED; /* Grease-Pencil Data (annotation layers) */ @@ -225,6 +227,7 @@ typedef struct View3D { #define V3D_DISPBGPICS 2 #define V3D_HIDE_HELPLINES 4 #define V3D_INVALID_BACKBUF 8 +#define V3D_INVALID_BACKBUF 8 #define V3D_ALIGN 1024 #define V3D_SELECT_OUTLINE 2048 @@ -261,14 +264,16 @@ typedef struct View3D { /* View3d->flag2 (short) */ #define V3D_RENDER_OVERRIDE 4 #define V3D_SOLID_TEX 8 -#define V3D_DISPGP 16 +#define V3D_SHOW_GPENCIL 16 #define V3D_LOCK_CAMERA 32 -#define V3D_RENDER_SHADOW 64 /* This is a runtime only flag that's used to tell draw_mesh_object() that we're doing a shadow pass instead of a regular draw */ -#define V3D_SHOW_RECONSTRUCTION 128 +#define V3D_RENDER_SHADOW 64 /* This is a runtime only flag that's used to tell draw_mesh_object() that we're doing a shadow pass instead of a regular draw */ +#define V3D_SHOW_RECONSTRUCTION 128 #define V3D_SHOW_CAMERAPATH 256 #define V3D_SHOW_BUNDLENAME 512 #define V3D_BACKFACE_CULLING 1024 -#define V3D_RENDER_BORDER 2048 +#define V3D_RENDER_BORDER 2048 +#define V3D_SOLID_MATCAP 4096 /* user flag */ +#define V3D_SHOW_SOLID_MATCAP 8192 /* runtime flag */ /* View3D->around */ #define V3D_CENTER 0 |