From f7e35d61f826c8e3581b34eea36b8fc39c572bee Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 13 Apr 2019 15:20:15 +0200 Subject: Cleanup: add View3D_Runtime struct Also remove 'matcap_icon' --- source/blender/makesdna/DNA_view3d_types.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'source/blender/makesdna/DNA_view3d_types.h') diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 075ea50c13b..cced70b0109 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -223,6 +223,11 @@ typedef struct View3DOverlay { } View3DOverlay; +typedef struct View3D_Runtime { + /** Nkey panel stores stuff here. */ + void *properties_storage; +} View3D_Runtime; + /* 3D ViewPort Struct */ typedef struct View3D { struct SpaceLink *next, *prev; @@ -275,10 +280,7 @@ typedef struct View3D { float clip_start, clip_end; float ofs[3] DNA_DEPRECATED; - char _pad[4]; - - /** Icon id. */ - short matcap_icon; + char _pad[6]; short gridlines; /** Number of subdivisions in the grid between each highlighted grid line. */ @@ -295,9 +297,6 @@ typedef struct View3D { * instead set (temporarily) from camera */ struct GPUFXSettings fx_settings; - /** Nkey panel stores stuff here (runtime only!). */ - void *properties_storage; - /* XXX deprecated? */ /** Grease-Pencil Data (annotation layers). */ struct bGPdata *gpd DNA_DEPRECATED; @@ -316,6 +315,9 @@ typedef struct View3D { View3DShading shading; View3DOverlay overlay; + + /** Runtime evaluation data (keep last). */ + View3D_Runtime runtime; } View3D; -- cgit v1.2.3