[Bf-blender-cvs] [4492e1d08a3] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 4492e1d08a3be23526e4031aeaa86ab27f9a38cc
Author: Antonio Vazquez
Date:   Thu Jan 18 12:01:18 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB4492e1d08a3be23526e4031aeaa86ab27f9a38cc

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/makesdna/DNA_scene_types.h

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



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

diff --cc source/blender/makesdna/DNA_scene_types.h
index 48bd488a3f6,4d910588975..53dfe2f1b48
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -1196,20 -1197,13 +1206,20 @@@ typedef enum eGP_EditBrush_Flag 
  
  /* GPencil Stroke Sculpting Settings */
  typedef struct GP_BrushEdit_Settings {
 -	GP_EditBrush_Data brush[11];  /* TOT_GP_EDITBRUSH_TYPES */
 +	GP_EditBrush_Data brush[12];  /* TOT_GP_EDITBRUSH_TYPES */
  	void *paintcursor;            /* runtime */
  	
 -	int brushtype;                /* eGP_EditBrush_Types */
 +	int brushtype;                /* eGP_EditBrush_Types (sculpt) */
  	int flag;                     /* eGP_BrushEdit_SettingsFlag */
- 	int lock_axis;                /* lock drawing to one axis */
+ 	int lock_axis;                /* eGP_Lockaxis_Types lock drawing to one axis */
  	float alpha;                  /* alpha factor for selection color */
 +
 +	/* 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_EditBrush_Types (weight paint) */
 +	char pad[4];
 +	struct CurveMapping *cur_falloff; /* multiframe edit falloff effect by frame */
  } GP_BrushEdit_Settings;
  
  /* GP_BrushEdit_Settings.flag */
@@@ -1698,9 -1686,7 +1709,10 @@@ typedef struct Scene 
  
  	uint64_t customdata_mask;	/* XXX. runtime flag for drawing, actually belongs in the window, only used by BKE_object_handle_update() */
  	uint64_t customdata_mask_modal; /* XXX. same as above but for temp operator use (gl renders) */
+ 
 +	
 +	struct Object *gp_object;     /* default GP object for annotations */
 +
  	/* Color Management */
  	ColorManagedViewSettings view_settings;
  	ColorManagedDisplaySettings display_settings;
@@@ -2200,34 -2187,16 +2213,34 @@@ typedef enum eGPencil_Flags 
  	/* When creating new frames, the last frame gets used as the basis for the new one */
  	GP_TOOL_FLAG_RETAIN_LAST            = (1 << 1),
  	/* Add the strokes below all strokes in the layer */
 -	GP_TOOL_FLAG_PAINT_ONBACK = (1 << 2)
 +	GP_TOOL_FLAG_PAINT_ONBACK = (1 << 2),
  } eGPencil_Flags;
  
 -/* ToolSettings.gpencil_src */
 -typedef enum eGPencil_Source_3D {
 -	GP_TOOL_SOURCE_SCENE    = 0,
 -	GP_TOOL_SOURCE_OBJECT   = 1
 -} eGPencil_Source_3d;
 +/* toolsettings->gpencil_simplify */
 +typedef enum eGPencil_SimplifyFlags {
 +	/* Simplify */
 +	GP_TOOL_FLAG_SIMPLIFY = (1 << 0),
 +	/* Simplify on play */
 +	GP_TOOL_FLAG_SIMPLIFY_ON_PLAY = (1 << 1),
 +	/* Simplify fill on viewport */
 +	GP_TOOL_FLAG_SIMPLIFY_VIEW_FILL = (1 << 2),
 +	/* Simplify modifier on viewport */
 +	GP_TOOL_FLAG_SIMPLIFY_VIEW_MODIF = (1 << 3),
 +	/* Simplify vfx modifier on viewport */
 +	GP_TOOL_FLAG_SIMPLIFY_VIEW_VFX = (1 << 4),
 +	/* Simplify fill on render */
 +	GP_TOOL_FLAG_SIMPLIFY_RENDER_FILL = (1 << 5),
 +	/* Simplify modifier on render */
 +	GP_TOOL_FLAG_SIMPLIFY_RENDER_MODIF = (1 << 6),
 +	/* Simplify vfx modifier on render */
 +	GP_TOOL_FLAG_SIMPLIFY_RENDER_VFX = (1 << 7),
 +	/* Remove fill external line */
 +	GP_TOOL_FLAG_SIMPLIFY_REMOVE_LINE = (1 << 8),
 +	/* Disable fast drawing */
 +	GP_TOOL_FLAG_DISABLE_FAST_DRAWING = (1 << 9),
 +} eGPencil_SimplifyFlags;
  
- /* toolsettings->gpencil_*_align - Stroke Placement mode flags */
+ /* ToolSettings.gpencil_*_align - Stroke Placement mode flags */
  typedef enum eGPencil_Placement_Flags {
  	/* New strokes are added in viewport/data space (i.e. not screen space) */
  	GP_PROJECT_VIEWSPACE    = (1 << 0),
@@@ -2241,10 -2210,9 +2254,10 @@@
  	
  	/* "Use Endpoints" */
  	GP_PROJECT_DEPTH_STROKE_ENDPOINTS = (1 << 4),
 +	GP_PROJECT_CURSOR = (1 << 5),
  } eGPencil_Placement_Flags;
  
- /* toolsettings->particle flag */
+ /* ToolSettings.particle flag */
  #define PE_KEEP_LENGTHS			1
  #define PE_LOCK_FIRST			2
  #define PE_DEFLECT_EMITTER		4