Merge branch 'master' into blender2.8

Notes:

- Changes in paint_vertex.c were simple to merge, mainly related on passing
  evaluation context.

- Conflicts in EditDM and drawmesh.c are solved using code from blender2.8
  branch. Those areas are deprecated and not to be used in final release.

  However, it's possible that some reference code from master is lost, so
  keep attention when adding alpha support for vertex painting.

1 files changed, 15 insertions, 7 deletions

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index e073c6a9f13..4c1accdcdf1 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1121,18 +1121,26 @@ typedef struct UvSculpt {
 /* Vertex Paint */
 typedef struct VPaint {
 	Paint paint;
-	short flag, pad;
+	short flag;
+	char falloff_shape, normal_angle;
 	int radial_symm[3]; /* For mirrored painting */
 } VPaint;
 
 /* VPaint.flag */
 enum {
-	// VP_COLINDEX  = (1 << 0),  /* only paint onto active material*/  /* deprecated since before 2.49 */
-	// VP_AREA      = (1 << 1),  /* deprecated since 2.70 */
-	VP_NORMALS      = (1 << 3),
-	VP_SPRAY        = (1 << 4),
-	// VP_MIRROR_X  = (1 << 5),  /* deprecated in 2.5x use (me->editflag & ME_EDIT_MIRROR_X) */
-	VP_ONLYVGROUP   = (1 << 7)   /* weight paint only */
+	VP_FLAG_PROJECT_BACKFACE    = (1 << 0),
+	/* TODO */
+	// VP_FLAG_PROJECT_XRAY        = (1 << 1),
+	VP_FLAG_PROJECT_FLAT        = (1 << 3),
+	VP_FLAG_SPRAY               = (1 << 4),
+	/* weight paint only */
+	VP_FLAG_VGROUP_RESTRICT     = (1 << 7)
+};
+
+/* VPaint.falloff_shape */
+enum {
+	VP_FALLOFF_SHAPE_SPHERE = 0,
+	VP_FALLOFF_SHAPE_TUBE = 1,
 };
 
 /* ------------------------------------------- */