diff options
Diffstat (limited to 'source/blender/makesdna/DNA_view3d_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 6dbed4d5d6f..fedc604f120 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -49,6 +49,7 @@ struct GPUViewport; #include "DNA_defs.h" #include "DNA_listBase.h" #include "DNA_image_types.h" +#include "DNA_object_types.h" #include "DNA_movieclip_types.h" #include "DNA_gpu_types.h" @@ -89,7 +90,7 @@ typedef struct RegionView3D { struct wmTimer *smooth_timer; - /* transform manipulator matrix */ + /* transform gizmo matrix */ float twmat[4][4]; /* min/max dot product on twmat xyz axis. */ float tw_axis_min[3], tw_axis_max[3]; @@ -134,11 +135,14 @@ typedef struct View3DCursor { /* 3D Viewport Shading setings */ typedef struct View3DShading { + short type; /* Shading type (VIEW3D_SHADE_SOLID, ..) */ + short prev_type; /* Runtime, for toggle between rendered viewport. */ + short flag; short color_type; short light; - char pad[2]; + short pad[3]; char studio_light[256]; /* FILE_MAXFILE */ char matcap[256]; /* FILE_MAXFILE */ @@ -174,12 +178,12 @@ typedef struct View3DOverlay { /* Armature edit/pose mode settings */ int arm_flag; - float bone_selection_alpha; + float bone_select_alpha; /* Other settings */ float wireframe_threshold; + char _pad0[4]; - int pad; } View3DOverlay; /* 3D ViewPort Struct */ @@ -201,6 +205,9 @@ typedef struct View3D { unsigned int lay_prev; /* for active layer toggle */ unsigned int lay_used; /* used while drawing */ + int object_type_exclude_viewport; + int object_type_exclude_select; + short persp DNA_DEPRECATED; short view DNA_DEPRECATED; @@ -232,13 +239,14 @@ typedef struct View3D { short gridsubdiv; /* Number of subdivisions in the grid between each highlighted grid line */ char gridflag; - /* transform manipulator info */ - char twtype, _pad5, twflag; + /* transform gizmo info */ + char _pad5[2], gizmo_flag; short flag3; /* drawflags, denoting state */ - char zbuf, transp, xray; + char _pad2; + char transp, xray; char multiview_eye; /* multiview current eye - for internal use */ @@ -262,9 +270,8 @@ typedef struct View3D { float stereo3d_convergence_alpha; /* Display settings */ - short drawtype; /* Shading mode (OB_SOLID, OB_TEXTURE, ..) */ - short prev_drawtype; /* Runtime, for toggle between rendered viewport. */ - int pad5; + short drawtype DNA_DEPRECATED; + short pad5[3]; View3DShading shading; View3DOverlay overlay; @@ -356,10 +363,11 @@ enum { V3D_SHADING_OBJECT_OUTLINE = (1 << 0), V3D_SHADING_XRAY = (1 << 1), V3D_SHADING_SHADOW = (1 << 2), - V3D_SHADING_SCENE_LIGHT = (1 << 3), + V3D_SHADING_SCENE_LIGHTS = (1 << 3), V3D_SHADING_SPECULAR_HIGHLIGHT = (1 << 4), V3D_SHADING_CAVITY = (1 << 5), V3D_SHADING_MATCAP_FLIP_X = (1 << 6), + V3D_SHADING_SCENE_WORLD = (1 << 7), }; /* View3DShading->color_type */ @@ -374,12 +382,15 @@ enum { enum { V3D_OVERLAY_FACE_ORIENTATION = (1 << 0), V3D_OVERLAY_HIDE_CURSOR = (1 << 1), - V3D_OVERLAY_BONE_SELECTION = (1 << 2), + V3D_OVERLAY_BONE_SELECT = (1 << 2), V3D_OVERLAY_LOOK_DEV = (1 << 3), V3D_OVERLAY_WIREFRAMES = (1 << 4), V3D_OVERLAY_HIDE_TEXT = (1 << 5), V3D_OVERLAY_HIDE_MOTION_PATHS = (1 << 6), V3D_OVERLAY_ONION_SKINS = (1 << 7), + V3D_OVERLAY_HIDE_BONES = (1 << 8), + V3D_OVERLAY_HIDE_OBJECT_XTRAS = (1 << 9), + V3D_OVERLAY_HIDE_OBJECT_ORIGINS = (1 << 10), }; /* View3DOverlay->edit_flag */ @@ -442,9 +453,13 @@ enum { #define V3D_MANIP_CURSOR 5 #define V3D_MANIP_CUSTOM 1024 -/* View3d->twflag (also) */ +/* View3d.mpr_flag (also) */ enum { - V3D_MANIPULATOR_DRAW = (1 << 0), + /** All gizmos. */ + V3D_GIZMO_HIDE = (1 << 0), + V3D_GIZMO_HIDE_NAVIGATE = (1 << 1), + V3D_GIZMO_HIDE_CONTEXT = (1 << 2), + V3D_GIZMO_HIDE_TOOL = (1 << 3), }; #define RV3D_CAMZOOM_MIN -30 |