Gizmo: move transform to a persistent option

[blender.git] / source / blender / makesrna / intern / rna_space.c

diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index a3a55a77ca4ddd3697cbcfe80f43ea97bae85499..aab07061997667a452eb5f0448ffe6b4d162921c 100644 (file)
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -513,6 +513,14 @@ static void rna_GPencil_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *UN
        WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL);
 }
 
        WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL);
 }
 

+static void rna_SpaceView3D_gizmo_flag_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+{
+       View3D *v3d = ptr->data;
+       if ((v3d->gizmo_type_mask & (V3D_GIZMO_TYPE_MASK_TRANSLATE | V3D_GIZMO_TYPE_MASK_ROTATE | V3D_GIZMO_TYPE_MASK_SCALE)) == 0) {
+               v3d->gizmo_type_mask |= V3D_GIZMO_TYPE_MASK_TRANSLATE;
+       }
+}
+

 /* Space 3D View */
 static void rna_SpaceView3D_camera_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 /* Space 3D View */
 static void rna_SpaceView3D_camera_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {


@@ -3093,6 +3101,13 @@ static void rna_def_space_view3d(BlenderRNA *brna)
                {0, NULL, 0, NULL, NULL},
        };
 
                {0, NULL, 0, NULL, NULL},
        };
 

+       static const EnumPropertyItem rna_enum_gizmo_items[] = {
+               {V3D_GIZMO_TYPE_MASK_TRANSLATE, "TRANSLATE", 0, "Move", ""},
+               {V3D_GIZMO_TYPE_MASK_ROTATE, "ROTATE", 0, "Rotate", ""},
+               {V3D_GIZMO_TYPE_MASK_SCALE, "SCALE", 0, "Scale", ""},
+               {0, NULL, 0, NULL, NULL},
+       };
+

        srna = RNA_def_struct(brna, "SpaceView3D", "Space");
        RNA_def_struct_sdna(srna, "View3D");
        RNA_def_struct_ui_text(srna, "3D View Space", "3D View space data");
        srna = RNA_def_struct(brna, "SpaceView3D", "Space");
        RNA_def_struct_sdna(srna, "View3D");
        RNA_def_struct_ui_text(srna, "3D View Space", "3D View space data");


@@ -3202,6 +3217,13 @@ static void rna_def_space_view3d(BlenderRNA *brna)
        RNA_def_property_ui_text(prop, "Tool Gizmo", "Active tool gizmo");
        RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 
        RNA_def_property_ui_text(prop, "Tool Gizmo", "Active tool gizmo");
        RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 

+       prop = RNA_def_property(srna, "show_gizmo_transform", PROP_ENUM, PROP_NONE);
+       RNA_def_property_enum_sdna(prop, NULL, "gizmo_type_mask");
+       RNA_def_property_enum_items(prop, rna_enum_gizmo_items);
+       RNA_def_property_flag(prop, PROP_ENUM_FLAG);
+       RNA_def_property_ui_text(prop, "Gizmo Mode",  "");
+       RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_SpaceView3D_gizmo_flag_update");
+

        prop = RNA_def_property(srna, "use_local_camera", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "scenelock", 1);
        RNA_def_property_boolean_funcs(prop, NULL, "rna_SpaceView3D_use_local_camera_set");
        prop = RNA_def_property(srna, "use_local_camera", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "scenelock", 1);
        RNA_def_property_boolean_funcs(prop, NULL, "rna_SpaceView3D_use_local_camera_set");