diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
| commit | 386ba094988fc793f8e060d15438566e5e2d2cae (patch) | |
| tree | 4cbde50b5d1d7a45c89ee99c29dd1b86d1d97b59 /source/blender/makesdna/DNA_view3d_types.h | |
| parent | 6129e20cec4639aebf335ff13b2ba0c59670662d (diff) | |
| parent | f97a64aa9b7b384f8221a1ef4f2eef9cde1238db (diff) | |
Merge branch 'master' into temp-gpencil-drw-engine
Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.c
Diffstat (limited to 'source/blender/makesdna/DNA_view3d_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 51655790fbd..283c361cc56 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -152,7 +152,7 @@ typedef struct View3DShading { char background_type; char cavity_type; char wire_color_type; - char _pad[6]; + char _pad[2]; /** FILE_MAXFILE. */ char studio_light[256]; @@ -166,6 +166,7 @@ typedef struct View3DShading { float studiolight_rot_z; float studiolight_background; + float studiolight_intensity; float object_outline_color[3]; float xray_alpha; @@ -179,6 +180,7 @@ typedef struct View3DShading { float curvature_ridge_factor; float curvature_valley_factor; + struct IDProperty *prop; } View3DShading; /** 3D Viewport Overlay settings. */ @@ -264,6 +266,8 @@ typedef struct View3D { unsigned short local_view_uuid; char _pad6[2]; int layact DNA_DEPRECATED; + unsigned short local_collections_uuid; + short _pad7[3]; /** Optional bool for 3d cursor to define center. */ short ob_centre_cursor; @@ -327,7 +331,7 @@ typedef struct View3D { #define V3D_S3D_DISPVOLUME (1 << 2) /** #View3D.flag */ -#define V3D_FLAG_UNUSED_0 (1 << 0) /* cleared */ +#define V3D_LOCAL_COLLECTIONS (1 << 0) #define V3D_FLAG_UNUSED_1 (1 << 1) /* cleared */ #define V3D_HIDE_HELPLINES (1 << 2) #define V3D_INVALID_BACKBUF (1 << 3) @@ -347,6 +351,7 @@ typedef struct View3D { #define RV3D_CLIPPING (1 << 2) #define RV3D_NAVIGATING (1 << 3) #define RV3D_GPULIGHT_UPDATE (1 << 4) +#define RV3D_PAINTING (1 << 5) /*#define RV3D_IS_GAME_ENGINE (1 << 5) */ /* UNUSED */ /** * Disable zbuffer offset, skip calls to #ED_view3d_polygon_offset. @@ -394,8 +399,9 @@ typedef struct View3D { #define V3D_GP_SHOW_GRID (1 << 1) /* Activate paper grid */ #define V3D_GP_SHOW_EDIT_LINES (1 << 2) #define V3D_GP_SHOW_MULTIEDIT_LINES (1 << 3) -#define V3D_GP_SHOW_ONION_SKIN (1 << 4) /* main switch at view level */ -#define V3D_GP_FADE_NOACTIVE_LAYERS (1 << 5) /* fade layers not active */ +#define V3D_GP_SHOW_ONION_SKIN (1 << 4) /* main switch at view level */ +#define V3D_GP_FADE_NOACTIVE_LAYERS (1 << 5) /* fade layers not active */ +#define V3D_GP_FADE_NOACTIVE_GPENCIL (1 << 6) /* Fade other GPencil objects */ /** #View3DShading.light */ enum { @@ -418,6 +424,8 @@ enum { V3D_SHADING_WORLD_ORIENTATION = (1 << 9), V3D_SHADING_BACKFACE_CULLING = (1 << 10), V3D_SHADING_DEPTH_OF_FIELD = (1 << 11), + V3D_SHADING_SCENE_LIGHTS_RENDER = (1 << 12), + V3D_SHADING_SCENE_WORLD_RENDER = (1 << 13), }; /** #View3DShading.color_type */ |