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

[Antonio Vazquez]

Commit: 38cdaa97fb77734f2ba5dd93212ae86b90e0fd3d
Author: Antonio Vazquez
Date:   Thu Apr 5 16:14:18 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB38cdaa97fb77734f2ba5dd93212ae86b90e0fd3d

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/gpu/GPU_shader.h

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



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

diff --cc source/blender/gpu/GPU_shader.h
index a23e1fbf59d,486aea561c4..3183a4857cd
--- 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_NODELINK,
+ 	GPU_SHADER_2D_NODELINK_INST,
  
  	GPU_SHADER_3D_INSTANCE_BONE_ENVELOPE_SOLID,
  	GPU_SHADER_3D_INSTANCE_BONE_ENVELOPE_WIRE,