[Bf-blender-cvs] [24ef1cf07e2] master: Fix show large cursor preference not being fully removed and causing warnings

[Brecht Van Lommel]

Commit: 24ef1cf07e2f653ac12856b5eeba177305c1d43b
Author: Brecht Van Lommel
Date:   Sun Mar 1 16:12:42 2020 +0100
Branches: master
https://developer.blender.org/rB24ef1cf07e2f653ac12856b5eeba177305c1d43b

Fix show large cursor preference not being fully removed and causing warnings

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

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 09ce29200b3..576cff5bd0e 100644
--- a/release/datafiles/userdef/userdef_default.c
+++ b/release/datafiles/userdef/userdef_default.c
@@ -136,7 +136,6 @@ const UserDef U_default = {
     .recent_files = 10,
     .smooth_viewtx = 200,
     .glreslimit = 0,
-    .curssize = 0,
     .color_picker_type = USER_CP_CIRCLE_HSV,
     .auto_smoothing_new = FCURVE_SMOOTH_CONT_ACCEL,
     .ipo_new = BEZT_IPO_BEZ,
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 386f8150637..d40559bc194 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -748,7 +748,6 @@ typedef struct UserDef {
   /** Milliseconds to spend spinning the view. */
   short smooth_viewtx;
   short glreslimit;
-  short curssize DNA_DEPRECATED;
   /** #eColorPicker_Types. */
   short color_picker_type;
   /** Curve smoothing type for newly added F-Curves. */
@@ -757,7 +756,7 @@ typedef struct UserDef {
   char ipo_new;
   /** Handle types for newly added keyframes. */
   char keyhandles_new;
-  char _pad11[2];
+  char _pad11[4];
   /** #eZoomFrame_Mode. */
   char view_frame_type;
 
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index dfa7bf90bb6..566305ad1c7 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4352,11 +4352,6 @@ static void rna_def_userdef_view(BlenderRNA *brna)
       prop, "Display Object Info", "Display objects name and frame number in 3D view");
   RNA_def_property_update(prop, 0, "rna_userdef_update");
 
-  prop = RNA_def_property(srna, "show_large_cursors", PROP_BOOLEAN, PROP_NONE);
-  RNA_def_property_boolean_sdna(prop, NULL, "curssize", 0);
-  RNA_def_property_ui_text(prop, "Large Cursors", "Use large mouse cursors when available");
-  RNA_def_property_update(prop, 0, "rna_userdef_update");
-
   prop = RNA_def_property(srna, "show_view_name", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_SHOW_VIEWPORTNAME);
   RNA_def_property_ui_text(