[Bf-blender-cvs] [e6296a54f27] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonioya]

Commit: e6296a54f27242f2b4d51e1a9fc92afecb1bed06
Author: Antonioya
Date:   Mon Jan 7 19:05:48 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe6296a54f27242f2b4d51e1a9fc92afecb1bed06

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/makesdna/DNA_gpencil_types.h
	source/blender/makesdna/DNA_scene_types.h

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



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

diff --cc source/blender/makesdna/DNA_gpencil_types.h
index 5a544691f88,0ae193752a8..17813021fdf
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@@ -165,22 -181,32 +181,33 @@@ typedef struct bGPDstroke_Runtime 
  typedef struct bGPDstroke {
  	struct bGPDstroke *next, *prev;
  
- 	bGPDspoint *points;		/* array of data-points for stroke */
- 	bGPDtriangle *triangles;/* tessellated triangles for GP Fill */
- 	int totpoints;          /* number of data-points in array */
- 	int tot_triangles;      /* number of triangles in array */
+ 	/** Array of data-points for stroke. */
+ 	bGPDspoint *points;
+ 	/** Tessellated triangles for GP Fill. */
+ 	bGPDtriangle *triangles;
+ 	/** Number of data-points in array. */
+ 	int totpoints;
+ 	/** Number of triangles in array. */
+ 	int tot_triangles;
  
- 	short thickness;        /* thickness of stroke */
- 	short flag, _pad[2];    /* various settings about this stroke */
+ 	/** Thickness of stroke. */
+ 	short thickness;
+ 	/** Various settings about this stroke. */
+ 	short flag, _pad[2];
  
- 	double inittime;		/* Init time of stroke */
+ 	/** Init time of stroke. */
+ 	double inittime;
  
- 	char colorname[128] DNA_DEPRECATED;    /* color name */
+ 	/** Color name. */
+ 	char colorname[128] DNA_DEPRECATED;
  
- 	int mat_nr;             /* material index */
- 	short caps[2];          /* caps mode for each extrem */
+ 	/** Material index. */
+ 	int mat_nr;
 -	char _pad1[4];
++	/** Caps mode for each stroke extreme */
++	short caps[2];
  
- 	struct MDeformVert *dvert;    /* vertex weight data */
+ 	/** Vertex weight data. */
+ 	struct MDeformVert *dvert;
  
  	bGPDstroke_Runtime runtime;
  	char _pad2[4];
diff --cc source/blender/makesdna/DNA_scene_types.h
index c21bf075c9b,d227beda275..0838968d118
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -1031,22 -1092,29 +1106,32 @@@ typedef enum eGP_Sculpt_Flag 
  
  /* GPencil Stroke Sculpting Settings */
  typedef struct GP_Sculpt_Settings {
- 	GP_Sculpt_Data brush[12];  /* GP_SCULPT_TYPE_MAX */
- 	void *paintcursor;            /* runtime */
- 
- 	int brushtype;                /* eGP_Sculpt_Types (sculpt) */
- 	int flag;                     /* eGP_Sculpt_SettingsFlag */
- 	int lock_axis;                /* eGP_Lockaxis_Types lock drawing to one axis */
- 	float isect_threshold;       /* threshold for intersections */
+ 	/** GP_SCULPT_TYPE_MAX. */
+ 	GP_Sculpt_Data brush[12];
+ 	/** Runtime. */
+ 	void *paintcursor;
+ 
+ 	/** #eGP_Sculpt_Types (sculpt). */
+ 	int brushtype;
+ 	/** #eGP_Sculpt_SettingsFlag. */
+ 	int flag;
+ 	/** #eGP_Lockaxis_Types lock drawing to one axis. */
+ 	int lock_axis;
 -	char pad1[4];
++	/** Threshold for intersections */
++	float isect_threshold;
  
  	/* weight paint is a submode of sculpt but use its own index. All weight paint
  	 * brushes must be defined at the end of the brush array.
  	 */
- 	int weighttype;               /* eGP_Sculpt_Types (weight paint) */
- 	char _pad[4];
- 	struct CurveMapping *cur_falloff; /* multiframe edit falloff effect by frame */
- 	struct CurveMapping *cur_primitive; /* Curve used for primitive tools */
- 	struct GP_Sculpt_Guide guide; /* Guides used for paint tools */
+ 	/** #eGP_Sculpt_Types (weight paint). */
+ 	int weighttype;
+ 	char pad[4];
+ 	/** Multiframe edit falloff effect by frame. */
+ 	struct CurveMapping *cur_falloff;
+ 	/** Curve used for primitve tools. */
+ 	struct CurveMapping *cur_primitive;
++	/** Guides used for paint tools */
++	struct GP_Sculpt_Guide guide;
  } GP_Sculpt_Settings;
  
  /* GP_Sculpt_Settings.flag */