[Bf-blender-cvs] [1ec1797d35c] master: Cleanup: remove unused compute-id from preferences

[Campbell Barton]

Commit: 1ec1797d35c28bb27e6bbadd0aec37641d7a2475
Author: Campbell Barton
Date:   Thu Aug 1 09:08:43 2019 +1000
Branches: master
https://developer.blender.org/rB1ec1797d35c28bb27e6bbadd0aec37641d7a2475

Cleanup: remove unused compute-id from preferences

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

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

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

diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c
index acdccb79b07..e539953092b 100644
--- a/release/datafiles/userdef/userdef_default.c
+++ b/release/datafiles/userdef/userdef_default.c
@@ -159,7 +159,6 @@ const UserDef U_default = {
     .font_path_ui = "",
     .font_path_ui_mono = "",
     .compute_device_type = 0,
-    .compute_device_id = 0,
     .fcu_inactive_alpha = 0.25,
     .pie_tap_timeout = 20,
     .pie_initial_timeout = 0,
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 894dbc05c54..2d3d091c65d 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -756,8 +756,9 @@ typedef struct UserDef {
   char font_path_ui[1024];
   char font_path_ui_mono[1024];
 
+  /** Legacy, for backwards compatibility only. */
   int compute_device_type;
-  int compute_device_id;
+  char _pad6[4];
 
   /** Opacity of inactive F-Curves in F-Curve Editor. */
   float fcu_inactive_alpha;