[Bf-blender-cvs] [d81cabbaa86] soc-2017-package_manager: Merge branch 'master' of git.blender.org:blender into soc-2017-package_manager

[gandalf3]

Commit: d81cabbaa866f553b996717dad9825436977abc1
Author: gandalf3
Date:   Wed Aug 2 23:00:24 2017 -0700
Branches: soc-2017-package_manager
https://developer.blender.org/rBd81cabbaa866f553b996717dad9825436977abc1

Merge branch 'master' of git.blender.org:blender into soc-2017-package_manager

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



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

diff --cc source/blender/makesdna/DNA_userdef_types.h
index 11b9c1b48d2,6bbf5144d29..a14a8af8991
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -591,22 -595,21 +595,22 @@@ typedef enum eUserPref_Section 
  	USER_SECTION_THEME		= 4,
  	USER_SECTION_INPUT		= 5,
  	USER_SECTION_ADDONS 	= 6,
 +	USER_SECTION_PACKAGES 	= 7,
  } eUserPref_Section;
  
- /* flag */
+ /* UserDef.flag */
  typedef enum eUserPref_Flag {
  	USER_AUTOSAVE			= (1 << 0),
- /*	USER_AUTOGRABGRID		= (1 << 1),	deprecated */
- /*	USER_AUTOROTGRID		= (1 << 2),	deprecated */
- /*	USER_AUTOSIZEGRID		= (1 << 3),	deprecated */
+ 	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_TRACKBALL			= (1 << 5),
- /*	USER_DUPLILINK		= (1 << 6),	deprecated */
- /*	USER_FSCOLLUM			= (1 << 7),	deprecated */
+ 	USER_FLAG_DEPRECATED_6	= (1 << 6),  /* cleared */
+ 	USER_FLAG_DEPRECATED_7	= (1 << 7),  /* cleared */
  	USER_MAT_ON_OB			= (1 << 8),
- /*	USER_NO_CAPSLOCK		= (1 << 9), */  /* not used anywhere */
- /*	USER_VIEWMOVE			= (1 << 10), */ /* not used anywhere */
+ 	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),