diff options
author | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
commit | 0d2d4a6d4a75ac38c41f872c88255eab70e88ab7 (patch) | |
tree | b7a7518af86dddba48e05a98b3c2be55e8804721 /source/blender/makesdna/DNA_view3d_types.h | |
parent | 9b416c66fb714bdfd15a481489dbf650d0f389ea (diff) | |
parent | cfc6f9eb18e701f5be601b95c45004e8cf7fbc81 (diff) |
Merge branch 'master' into temp-ui-button-type-refactortemp-ui-button-type-refactor
Diffstat (limited to 'source/blender/makesdna/DNA_view3d_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index ef174f5858f..7bfdc14d25c 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -21,8 +21,7 @@ * \ingroup DNA */ -#ifndef __DNA_VIEW3D_TYPES_H__ -#define __DNA_VIEW3D_TYPES_H__ +#pragma once struct BoundBox; struct Object; @@ -191,6 +190,7 @@ typedef struct View3DShading { int render_pass; struct IDProperty *prop; + void *_pad2; } View3DShading; /** 3D Viewport Overlay settings. */ @@ -629,5 +629,3 @@ enum { /** #BKE_screen_view3d_zoom_to_fac() values above */ #define RV3D_CAMZOOM_MIN_FACTOR 0.1657359312880714853f #define RV3D_CAMZOOM_MAX_FACTOR 44.9852813742385702928f - -#endif |