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

[Antonio Vazquez]

Commit: d1130c5f4e6707e92d6420cb674841881e88139c
Author: Antonio Vazquez
Date:   Thu Mar 29 17:40:51 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd1130c5f4e6707e92d6420cb674841881e88139c

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/gpu/GPU_shader.h

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



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

diff --cc source/blender/gpu/GPU_shader.h
index a0f2dc456df,6a156b32c35..d1d7cd5448d
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@@ -169,9 -169,8 +169,11 @@@ typedef enum GPUBuiltinShader 
  	GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE, /* Uniformly scaled */
  	GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SCALE,
  	GPU_SHADER_INSTANCE_EDGES_VARIYING_COLOR,
 +	/* grease pencil drawing */
 +	GPU_SHADER_GPENCIL_STROKE,
 +	GPU_SHADER_GPENCIL_FILL,
+ 	/* specialized for widget drawing */
+ 	GPU_SHADER_2D_WIDGET_BASE,
  
  	GPU_SHADER_3D_INSTANCE_BONE_ENVELOPE_SOLID,
  	GPU_SHADER_3D_INSTANCE_BONE_ENVELOPE_WIRE,