[Bf-blender-cvs] [38bf3b8d230] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 38bf3b8d23041c547186fee5633782384c8ab384
Author: Campbell Barton
Date:   Sun Jun 3 11:24:57 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB38bf3b8d23041c547186fee5633782384c8ab384

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesdna/DNA_space_types.h
index bbea3b168e3,00575532d38..1b55a97754a
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@@ -1367,48 -1428,7 +1391,50 @@@ typedef enum eSpaceClip_GPencil_Source 
  	SC_GPENCIL_SRC_TRACK = 1,
  } eSpaceClip_GPencil_Source;
  
 -/* **************** SPACE DEFINES ********************* */
 +
 +/** \} */
 +
 +/* -------------------------------------------------------------------- */
 +/** \name Top Bar
 + * \{ */
 +
 +/* These two lines with # tell makesdna this struct can be excluded.
 + * Should be: #ifndef WITH_GLOBAL_AREA_WRITING */
 +#
 +#
 +typedef struct SpaceTopBar {
 +	SpaceLink *next, *prev;
 +	ListBase regionbase;        /* storage of regions for inactive spaces */
- 	int spacetype;
- 
- 	int pad;
++	char spacetype;
++	char link_flag;
++	char _pad0[6];
++	/* End 'SpaceLink' header. */
 +} SpaceTopBar;
 +
 +/** \} */
 +
 +/* -------------------------------------------------------------------- */
 +/** \name Status Bar
 + * \{ */
 +
 +/* These two lines with # tell makesdna this struct can be excluded.
 + * Should be: #ifndef WITH_GLOBAL_AREA_WRITING */
 +#
 +#
 +typedef struct SpaceStatusBar {
 +	SpaceLink *next, *prev;
 +	ListBase regionbase;        /* storage of regions for inactive spaces */
- 	int spacetype;
- 
- 	int pad;
++	char spacetype;
++	char link_flag;
++	char _pad0[6];
++	/* End 'SpaceLink' header. */
 +} SpaceStatusBar;
 +
 +/** \} */
 +
 +/* -------------------------------------------------------------------- */
 +/** \name Space Type Definitions
 + * \{ */
  
  /* space types, moved from DNA_screen_types.h */
  /* Do NOT change order, append on end. types are hardcoded needed */
diff --cc source/blender/makesdna/DNA_view3d_types.h
index 7bb2ce7af02,f7e2a98f66b..be980b4fead
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@@ -198,9 -179,13 +199,9 @@@ typedef struct View3D 
  	unsigned int lay;
  	int layact;
  	
 -	/**
 -	 * The drawing mode for the 3d display. Set to OB_BOUNDBOX, OB_WIRE, OB_SOLID,
 -	 * OB_TEXTURE, OB_MATERIAL or OB_RENDER */
 -	short drawtype;
  	short ob_centre_cursor;		/* optional bool for 3d cursor to define center */
- 	short scenelock, _pad0;
 -	short scenelock, around;
 -	short flag, flag2;
++	short scenelock, _pad1;
 +	short flag, flag2, pad2;
  	
  	float lens, grid;
  	float near, far;