Gizmo: move transform to a persistent option

[blender.git] / 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 cced70b01095427a7126c0ef310fcab79e1de984..b98d70c865fdb833fd9ace4c42fb7355db0b5681 100644 (file)
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -245,7 +245,11 @@ typedef struct View3D {
        float bundle_size;
        /** Display style for bundle. */
        char bundle_drawtype;
        float bundle_size;
        /** Display style for bundle. */
        char bundle_drawtype;

-       char _pad3[2];
+
+       /** #V3D_GIZMO_SHOW_* */
+       char gizmo_flag;
+
+       char _pad3[1];

 
        /** Multiview current eye - for internal use. */
        char multiview_eye;
 
        /** Multiview current eye - for internal use. */
        char multiview_eye;


@@ -288,7 +292,7 @@ typedef struct View3D {
        char gridflag;
 
        /** Transform gizmo info. */
        char gridflag;
 
        /** Transform gizmo info. */

-       char gizmo_flag;
+       char gizmo_type_mask;

 
        /* actually only used to define the opacity of the grease pencil vertex in edit mode */
        float vertex_opacity;
 
        /* actually only used to define the opacity of the grease pencil vertex in edit mode */
        float vertex_opacity;


@@ -545,7 +549,7 @@ enum {
        V3D_ORIENT_CUSTOM_MATRIX =   (V3D_ORIENT_CUSTOM - 1),
 };
 
        V3D_ORIENT_CUSTOM_MATRIX =   (V3D_ORIENT_CUSTOM - 1),
 };
 

-/* View3d.mpr_flag (also) */
+/** #View3d.gizmo_flag */

 enum {
        /** All gizmos. */
        V3D_GIZMO_HIDE                = (1 << 0),
 enum {
        /** All gizmos. */
        V3D_GIZMO_HIDE                = (1 << 0),


@@ -554,6 +558,13 @@ enum {
        V3D_GIZMO_HIDE_TOOL           = (1 << 3),
 };
 
        V3D_GIZMO_HIDE_TOOL           = (1 << 3),
 };
 

+/** #View3d.gizmo_type_mask */
+enum {
+       V3D_GIZMO_TYPE_MASK_TRANSLATE = (1 << 0),
+       V3D_GIZMO_TYPE_MASK_ROTATE    = (1 << 1),
+       V3D_GIZMO_TYPE_MASK_SCALE     = (1 << 2),
+};
+

 #define RV3D_CAMZOOM_MIN -30
 #define RV3D_CAMZOOM_MAX 600
 
 #define RV3D_CAMZOOM_MIN -30
 #define RV3D_CAMZOOM_MAX 600