[Bf-blender-cvs] [0e26707bce2] blender2.8: Merge branch 'master' into blender2.8

Campbell Barton noreply at git.blender.org
Fri Jul 28 22:32:18 CEST 2017


Commit: 0e26707bce243daece1c699c223d5f26d7d45e48
Author: Campbell Barton
Date:   Sat Jul 29 06:44:04 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB0e26707bce243daece1c699c223d5f26d7d45e48

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesdna/DNA_userdef_types.h
index e2eb1364be2,62c1eb0b91b..4aba028fbd6
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -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),




More information about the Bf-blender-cvs mailing list