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

[Antonio Vazquez]

Commit: 734cd4669115db6c59267ee0ff12a0dc58ac5351
Author: Antonio Vazquez
Date:   Fri Mar 6 12:39:14 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB734cd4669115db6c59267ee0ff12a0dc58ac5351

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/scene.c

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



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

diff --cc source/blender/makesdna/DNA_object_enums.h
index ecb2e84981c,c15f32564c4..f3e69161c85
--- a/source/blender/makesdna/DNA_object_enums.h
+++ b/source/blender/makesdna/DNA_object_enums.h
@@@ -37,9 -37,18 +37,19 @@@ typedef enum eObjectMode 
    OB_MODE_PAINT_GPENCIL = 1 << 8,
    OB_MODE_SCULPT_GPENCIL = 1 << 9,
    OB_MODE_WEIGHT_GPENCIL = 1 << 10,
 +  OB_MODE_VERTEX_GPENCIL = 1 << 11,
  } eObjectMode;
  
+ /** #Object.dt, #View3DShading.type */
+ typedef enum eDrawType {
+   OB_BOUNDBOX = 1,
+   OB_WIRE = 2,
+   OB_SOLID = 3,
+   OB_MATERIAL = 4,
+   OB_TEXTURE = 5,
+   OB_RENDER = 6,
+ } eDrawType;
+ 
  /** Any mode where the brush system is used. */
  #define OB_MODE_ALL_PAINT \
    (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)