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

[Antonio Vazquez]

Commit: 47051a44a00ee9db477b9e3ca390a7be77d5faa7
Author: Antonio Vazquez
Date:   Fri Apr 6 16:07:19 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB47051a44a00ee9db477b9e3ca390a7be77d5faa7

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/gpu/GPU_shader.h
index 3183a4857cd,b33df9fdb20..e316ff9bcfd
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@@ -171,11 -171,10 +171,13 @@@ 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,
 -	/* specialized for UI drawing */
 +	/* grease pencil drawing */
 +	GPU_SHADER_GPENCIL_STROKE,
 +	GPU_SHADER_GPENCIL_FILL,
 +	/* specialized for widget drawing */
  	GPU_SHADER_2D_WIDGET_BASE,
+ 	GPU_SHADER_2D_WIDGET_BASE_INST,
+ 	GPU_SHADER_2D_WIDGET_SHADOW,
  	GPU_SHADER_2D_NODELINK,
  	GPU_SHADER_2D_NODELINK_INST,