[Bf-blender-cvs] [e77c65f73ce] master: Cleanup: group navigation gizmo size with generic gizmo size

[Campbell Barton]

Commit: e77c65f73ce2ef329d84311795225585ba6c06db
Author: Campbell Barton
Date:   Sun Jan 24 13:45:17 2021 +1100
Branches: master
https://developer.blender.org/rBe77c65f73ce2ef329d84311795225585ba6c06db

Cleanup: group navigation gizmo size with generic gizmo size

Also use `char` for these gizmo size & flag.

===================================================================

M	release/datafiles/userdef/userdef_default.c
M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/makesrna/intern/rna_userdef.c

===================================================================

diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c
index 471a14d8aac..2265e70df39 100644
--- a/release/datafiles/userdef/userdef_default.c
+++ b/release/datafiles/userdef/userdef_default.c
@@ -119,6 +119,7 @@ const UserDef U_default = {
 
     .gizmo_flag = USER_GIZMO_DRAW,
     .gizmo_size = 75,
+    .gizmo_size_navigate_v3d = 80,
     .edit_studio_light = 0,
     .lookdev_sphere_size = 150,
     .vbotimeout = 120,
@@ -131,7 +132,6 @@ const UserDef U_default = {
 
     .prefetchframes = 0,
     .pad_rot_angle = 15,
-    .gizmo_size_navigate_v3d = 80,
     .rvisize = 25,
     .rvibright = 8,
     .recent_files = 10,
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 114af653e4b..790f3423eef 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -762,8 +762,12 @@ typedef struct UserDef {
   char _pad13[4];
   struct SolidLight light_param[4];
   float light_ambient[3];
-  char _pad3[4];
-  short gizmo_flag, gizmo_size;
+  char gizmo_flag;
+  /** Generic gizmo size. */
+  char gizmo_size;
+  /** Navigate gizmo size. */
+  char gizmo_size_navigate_v3d;
+  char _pad3[5];
   short edit_studio_light;
   short lookdev_sphere_size;
   short vbotimeout, vbocollectrate;
@@ -773,9 +777,7 @@ typedef struct UserDef {
   int prefetchframes;
   /** Control the rotation step of the view when PAD2, PAD4, PAD6&PAD8 is use. */
   float pad_rot_angle;
-  /** Navigate gizmo size. */
-  char gizmo_size_navigate_v3d;
-  char _pad12[3];
+  char _pad12[4];
   /** Rotating view icon size. */
   short rvisize;
   /** Rotating view icon brightness. */
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 588d7080622..445ff773868 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4720,11 +4720,6 @@ static void rna_def_userdef_view(BlenderRNA *brna)
                            "Show a small rotating 3D axes in the top right corner of the 3D View");
   RNA_def_property_update(prop, 0, "rna_userdef_gizmo_update");
 
-  prop = RNA_def_property(srna, "gizmo_size_navigate_v3d", PROP_INT, PROP_PIXEL);
-  RNA_def_property_range(prop, 30, 200);
-  RNA_def_property_ui_text(prop, "Navigate Gizmo Size", "The Navigate Gizmo size");
-  RNA_def_property_update(prop, 0, "rna_userdef_gizmo_update");
-
   prop = RNA_def_property(srna, "mini_axis_size", PROP_INT, PROP_PIXEL);
   RNA_def_property_int_sdna(prop, NULL, "rvisize");
   RNA_def_property_range(prop, 10, 64);
@@ -4761,6 +4756,11 @@ static void rna_def_userdef_view(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Gizmo Size", "Diameter of the gizmo");
   RNA_def_property_update(prop, 0, "rna_userdef_update");
 
+  prop = RNA_def_property(srna, "gizmo_size_navigate_v3d", PROP_INT, PROP_PIXEL);
+  RNA_def_property_range(prop, 30, 200);
+  RNA_def_property_ui_text(prop, "Navigate Gizmo Size", "The Navigate Gizmo size");
+  RNA_def_property_update(prop, 0, "rna_userdef_gizmo_update");
+
   /* Lookdev */
   prop = RNA_def_property(srna, "lookdev_sphere_size", PROP_INT, PROP_PIXEL);
   RNA_def_property_int_sdna(prop, NULL, "lookdev_sphere_size");