Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 28 Jul 2017 20:44:04 +0000 (06:44 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 28 Jul 2017 20:44:04 +0000 (06:44 +1000)
1  2 
source/blender/editors/interface/resources.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_event_system.c

index e2eb1364be294fb3540374017958a817b5d5cb14,62c1eb0b91b5cf693da6c6dca1d7fdbcb422cb7b..4aba028fbd625c1cbaf139b51c59bfaf1ed68ea1
@@@ -601,12 -600,16 +601,16 @@@ typedef enum eUserPref_Section 
  /* UserDef.flag */
  typedef enum eUserPref_Flag {
        USER_AUTOSAVE                   = (1 << 0),
-       /* 1..3 */
+       USER_FLAG_DEPRECATED_1  = (1 << 1),  /* cleared */
+       USER_FLAG_DEPRECATED_2  = (1 << 2),  /* cleared */
+       USER_FLAG_DEPRECATED_3  = (1 << 3),  /* cleared */
 -      USER_SCENEGLOBAL                = (1 << 4),
 +/*    USER_SCENEGLOBAL         = (1 << 4), deprecated */
        USER_TRACKBALL                  = (1 << 5),
-       /* 6..7 */
+       USER_FLAG_DEPRECATED_6  = (1 << 6),  /* cleared */
+       USER_FLAG_DEPRECATED_7  = (1 << 7),  /* cleared */
        USER_MAT_ON_OB                  = (1 << 8),
-       /* 9..10 */
+       USER_FLAG_DEPRECATED_9  = (1 << 9),   /* cleared */
+       USER_FLAG_DEPRECATED_10 = (1 << 10),  /* cleared */
        USER_TOOLTIPS                   = (1 << 11),
        USER_TWOBUTTONMOUSE             = (1 << 12),
        USER_NONUMPAD                   = (1 << 13),