diff options
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 5 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 8 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_workspace_types.h | 3 |
3 files changed, 7 insertions, 9 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index db997aed1cb..1c518331cf7 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1481,7 +1481,10 @@ typedef struct Scene { struct AudioData audio; ListBase markers; - ListBase transform_spaces DNA_DEPRECATED; + ListBase transform_spaces; + + int orientation_index_custom; + int orientation_type; void *sound_scene; void *playback_handle; diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 70d0d8c9d4d..2b82638a6b8 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -197,7 +197,7 @@ typedef struct View3D { char gridflag; /* transform manipulator info */ - char twtype, twmode, twflag; + char twtype, _pad5, twflag; short flag3; @@ -211,9 +211,7 @@ typedef struct View3D { char multiview_eye; /* multiview current eye - for internal use */ - /* The active custom transform orientation of this 3D view. */ - short custom_orientation_index; - char pad3[2]; + char pad3[4]; /* note, 'fx_settings.dof' is currently _not_ allocated, * instead set (temporarily) from camera */ @@ -363,7 +361,7 @@ enum { #define V3D_MANIP_ROTATE 2 #define V3D_MANIP_SCALE 4 -/* View3d->twmode */ +/* Scene.orientation_type */ #define V3D_MANIP_GLOBAL 0 #define V3D_MANIP_LOCAL 1 #define V3D_MANIP_NORMAL 2 diff --git a/source/blender/makesdna/DNA_workspace_types.h b/source/blender/makesdna/DNA_workspace_types.h index 82aa7b8b81c..dab6f8c1ea0 100644 --- a/source/blender/makesdna/DNA_workspace_types.h +++ b/source/blender/makesdna/DNA_workspace_types.h @@ -95,9 +95,6 @@ typedef struct WorkSpace { /* Feature tagging (use for addons) */ ListBase owner_ids DNA_PRIVATE_WORKSPACE_READ_WRITE; /* wmOwnerID */ - /* Custom transform orientations */ - ListBase transform_orientations DNA_PRIVATE_WORKSPACE; - int pad; int flags DNA_PRIVATE_WORKSPACE; /* enum eWorkSpaceFlags */ |