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

[Antonio Vazquez]

Commit: 9b4931fdb76ea67771ef2ae49cd556fd1c3002ed
Author: Antonio Vazquez
Date:   Sun May 6 10:35:55 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB9b4931fdb76ea67771ef2ae49cd556fd1c3002ed

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/makesdna/DNA_scene_types.h

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



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

diff --cc source/blender/draw/intern/draw_manager.c
index 96cc67dde83,907c62d091e..08dbd7c7c10
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -1061,13 -1060,11 +1060,13 @@@ static void drw_engines_enable_from_mod
  			BLI_assert(!"Draw mode invalid");
  			break;
  	}
 +	/* grease pencil */
 +	use_drw_engine(&draw_engine_gpencil_type);
  }
  
- static void drw_engines_enable_from_overlays(int draw_overlays)
+ static void drw_engines_enable_from_overlays(int overlay_flag)
  {
- 	if (draw_overlays) {
+ 	if (overlay_flag) {
  		use_drw_engine(&draw_engine_overlay_type);
  	}
  }
diff --cc source/blender/makesdna/DNA_view3d_types.h
index 8a97e0cba75,a206d9e6642..de0abcae183
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@@ -241,12 -223,8 +223,10 @@@ typedef struct View3D 
  
  	/* XXX deprecated? */
  	struct bGPdata *gpd  DNA_DEPRECATED;		/* Grease-Pencil Data (annotation layers) */
 +	int gpencil_grid_size[2];
 +	float gpencil_paper_color[4];
  
- 	 /* multiview - stereo 3d */
+ 	/* Stereoscopy settings */
  	short stereo3d_flag;
  	char stereo3d_camera;
  	char pad4;
@@@ -341,16 -311,51 +313,52 @@@
  #define V3D_OCCLUDE_WIRE		(1 << 14)
  #define V3D_SHOW_MODE_SHADE_OVERRIDE	(1 << 15)
  
 -
  /* View3d->flag3 (short) */
  #define V3D_SHOW_WORLD			(1 << 0)
 +#define V3D_GP_SHOW_PAPER       (1 << 2) /* Activate paper to cover all viewport */
 +#define V3D_GP_SHOW_GRID        (1 << 3) /* Activate paper grid */
  
- /* View3d->debug.background */
+ /* View3DShading->light */
+ enum {
+ 	V3D_LIGHTING_FLAT   = 0,
+ 	V3D_LIGHTING_STUDIO = 1,
+ 	V3D_LIGHTING_SCENE  = 2
+ };
+ 
+ /* View3DShading->flag */
+ enum {
+ 	V3D_SHADING_OBJECT_OVERLAP = (1 << 0),
+ 	V3D_SHADING_SHADOW         = (1 << 2),
+ };
+ 
+ /* View3DShading->single_color_type */
+ enum {
+ 	V3D_SHADING_MATERIAL_COLOR = 0,
+ 	V3D_SHADING_RANDOM_COLOR   = 1,
+ 	V3D_SHADING_SINGLE_COLOR   = 2,
+ 	V3D_SHADING_OBJECT_COLOR   = 3,
+ };
+ 
+ /* View3DOverlay->flag */
+ enum {
+ 	V3D_OVERLAY_FACE_ORIENTATION  = (1 << 0),
+ 	V3D_OVERLAY_HIDE_CURSOR       = (1 << 1),
+ };
+ 
+ /* View3DOverlay->edit_flag */
+ enum {
+ 	V3D_OVERLAY_EDIT_VERT_NORMALS = (1 << 0),
+ 	V3D_OVERLAY_EDIT_LOOP_NORMALS = (1 << 1),
+ 	V3D_OVERLAY_EDIT_FACE_NORMALS = (1 << 2),
+ 
+ 	V3D_OVERLAY_EDIT_OCCLUDE_WIRE = (1 << 3),
+ 
+ 	V3D_OVERLAY_EDIT_WEIGHT       = (1 << 4),
+ };
+ 
+ /* View3DOverlay->paint_flag */
  enum {
- 	V3D_DEBUG_BACKGROUND_NONE     = (1 << 0),
- 	V3D_DEBUG_BACKGROUND_GRADIENT = (1 << 1),
- 	V3D_DEBUG_BACKGROUND_WORLD    = (1 << 2),
+ 	V3D_OVERLAY_PAINT_WIRE        = (1 << 0),
  };
  
  /* View3D->around */