[Bf-blender-cvs] [386ba094988] temp-gpencil-drw-engine: Merge branch 'master' into temp-gpencil-drw-engine

[Antonio Vazquez]

Commit: 386ba094988fc793f8e060d15438566e5e2d2cae
Author: Antonio Vazquez
Date:   Wed Oct 2 13:15:37 2019 +0200
Branches: temp-gpencil-drw-engine
https://developer.blender.org/rB386ba094988fc793f8e060d15438566e5e2d2cae

Merge branch 'master' into temp-gpencil-drw-engine

 Conflicts:
	source/blender/draw/engines/gpencil/gpencil_engine.c

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



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

diff --cc source/blender/draw/engines/gpencil/gpencil_engine.c
index aa5918feaa8,10e9a79d143..7d9f2d1fdf3
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@@ -60,8 -60,9 +60,10 @@@ extern char datatoc_gpencil_edit_point_
  extern char datatoc_gpencil_edit_point_geom_glsl[];
  extern char datatoc_gpencil_edit_point_frag_glsl[];
  extern char datatoc_gpencil_blend_frag_glsl[];
 +extern char datatoc_gpencil_merge_depth_frag_glsl[];
  
+ extern char datatoc_gpu_shader_3D_smooth_color_frag_glsl[];
+ 
  extern char datatoc_common_colormanagement_lib_glsl[];
  extern char datatoc_common_view_lib_glsl[];