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

[Antonio Vazquez]

Commit: ee7134fdd39966aba0dfa4525eca9e2c890f7da0
Author: Antonio Vazquez
Date:   Fri Feb 16 10:35:28 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBee7134fdd39966aba0dfa4525eca9e2c890f7da0

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/gpu/intern/gpu_shader.c
index a4ac8e5867b,c25d03dff2f..78ffb8a63b1
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@@ -830,15 -823,8 +830,15 @@@ GPUShader *GPU_shader_get_builtin_shade
  		[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_3D_INSTANCE_MBALL_HELPERS] = { datatoc_gpu_shader_instance_mball_helpers_vert_glsl,
+ 		[GPU_SHADER_3D_INSTANCE_MBALL_HANDLES] = { datatoc_gpu_shader_instance_mball_handles_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) {