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

[Antonio Vazquez]

Commit: 5e31d6ca40b51b3c9c4d70afe850ee4b17ae0952
Author: Antonio Vazquez
Date:   Thu Jul 13 17:25:51 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB5e31d6ca40b51b3c9c4d70afe850ee4b17ae0952

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/gpu/intern/gpu_shader.c
index faabc1654ef,e67e5bc933d..b42ab0500c7
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@@ -751,16 -744,9 +751,16 @@@ GPUShader *GPU_shader_get_builtin_shade
  		                                               datatoc_gpu_shader_instance_edges_variying_color_geom_glsl},
  
  		[GPU_SHADER_3D_INSTANCE_BONE_ENVELOPE_SOLID] = { datatoc_gpu_shader_instance_bone_envelope_solid_vert_glsl,
- 		                                           datatoc_gpu_shader_simple_lighting_frag_glsl },
+ 		                                                 datatoc_gpu_shader_simple_lighting_frag_glsl },
  		[GPU_SHADER_3D_INSTANCE_BONE_ENVELOPE_WIRE] = { datatoc_gpu_shader_instance_bone_envelope_wire_vert_glsl,
  		                                                datatoc_gpu_shader_flat_color_frag_glsl },
 +
 +		[GPU_SHADER_GPENCIL_STROKE] = { datatoc_gpu_shader_gpencil_stroke_vert_glsl,
 +									    datatoc_gpu_shader_gpencil_stroke_frag_glsl,
 +			                            datatoc_gpu_shader_gpencil_stroke_geom_glsl },
 +
 +		[GPU_SHADER_GPENCIL_FILL] = { datatoc_gpu_shader_gpencil_fill_vert_glsl,
 +		                              datatoc_gpu_shader_gpencil_fill_frag_glsl },
  	};
  
  	if (builtin_shaders[shader] == NULL) {