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

[Antonio Vazquez]

Commit: ccf3889b305019453ab0f7378a3eee7d8ee6d3c6
Author: Antonio Vazquez
Date:   Thu Mar 22 19:13:41 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBccf3889b305019453ab0f7378a3eee7d8ee6d3c6

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/space_view3d/view3d_draw_legacy.c
index afa539135a6,b7a1c8663f4..472ca47e55e
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@@ -1566,14 -1509,9 +1565,13 @@@ static void view3d_draw_objects
  	const bool draw_grids = !draw_offscreen && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0;
  	const bool draw_floor = (rv3d->view == RV3D_VIEW_USER) || (rv3d->persp != RV3D_ORTHO);
  	/* only draw grids after in solid modes, else it hovers over mesh wires */
- 	const bool draw_grids_after = draw_grids && draw_floor && (v3d->drawtype > OB_WIRE) && fx;
- 	bool do_composite_xray = false;
+ 	const bool draw_grids_after = draw_grids && draw_floor && (v3d->drawtype > OB_WIRE);
  	bool xrayclear = true;
  
 +	int gp_cache_used = 0;
 +	int gp_cache_size = 0;
 +	tGPencilSort *gp_cache = NULL;
 +
  	if (!draw_offscreen) {
  		ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
  	}
diff --cc source/blender/gpu/CMakeLists.txt
index f519f988c78,e1f99b4dc64..656cbbadf62
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@@ -222,24 -220,7 +220,15 @@@ data_to_c_simple(shaders/gpu_shader_ver
  data_to_c_simple(shaders/gpu_shader_vertex_world.glsl SRC)
  data_to_c_simple(shaders/gpu_shader_vsm_store_frag.glsl SRC)
  data_to_c_simple(shaders/gpu_shader_vsm_store_vert.glsl SRC)
- data_to_c_simple(shaders/gpu_shader_fullscreen_vert.glsl SRC)
- data_to_c_simple(shaders/gpu_shader_fx_ssao_frag.glsl SRC)
- data_to_c_simple(shaders/gpu_shader_fx_dof_frag.glsl SRC)
- data_to_c_simple(shaders/gpu_shader_fx_dof_vert.glsl SRC)
- data_to_c_simple(shaders/gpu_shader_fx_dof_hq_frag.glsl SRC)
- data_to_c_simple(shaders/gpu_shader_fx_dof_hq_vert.glsl SRC)
- data_to_c_simple(shaders/gpu_shader_fx_dof_hq_geo.glsl SRC)
- data_to_c_simple(shaders/gpu_shader_fx_depth_resolve.glsl SRC)
- data_to_c_simple(shaders/gpu_shader_fx_lib.glsl SRC)
  
 +data_to_c_simple(shaders/gpu_shader_gpencil_stroke_vert.glsl SRC)
 +data_to_c_simple(shaders/gpu_shader_gpencil_stroke_frag.glsl SRC)
 +data_to_c_simple(shaders/gpu_shader_gpencil_stroke_geom.glsl SRC)
 +
 +data_to_c_simple(shaders/gpu_shader_gpencil_fill_vert.glsl SRC)
 +data_to_c_simple(shaders/gpu_shader_gpencil_fill_frag.glsl SRC)
 +
 +
  if(WITH_GAMEENGINE)
  	add_definitions(-DWITH_GAMEENGINE)
  endif()
diff --cc source/blender/gpu/intern/gpu_shader.c
index b15e3e9b877,2cb3476d568..aad2d630e6f
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@@ -145,23 -144,7 +144,14 @@@ extern char datatoc_gpu_shader_vsm_stor
  extern char datatoc_gpu_shader_vsm_store_frag_glsl[];
  extern char datatoc_gpu_shader_sep_gaussian_blur_vert_glsl[];
  extern char datatoc_gpu_shader_sep_gaussian_blur_frag_glsl[];
- extern char datatoc_gpu_shader_fullscreen_vert_glsl[];
- extern char datatoc_gpu_shader_fx_ssao_frag_glsl[];
- extern char datatoc_gpu_shader_fx_dof_frag_glsl[];
- extern char datatoc_gpu_shader_fx_dof_vert_glsl[];
- extern char datatoc_gpu_shader_fx_dof_hq_frag_glsl[];
- extern char datatoc_gpu_shader_fx_dof_hq_vert_glsl[];
- extern char datatoc_gpu_shader_fx_dof_hq_geo_glsl[];
- extern char datatoc_gpu_shader_fx_depth_resolve_glsl[];
- extern char datatoc_gpu_shader_fx_lib_glsl[];
  
 +extern char datatoc_gpu_shader_gpencil_stroke_vert_glsl[];
 +extern char datatoc_gpu_shader_gpencil_stroke_frag_glsl[];
 +extern char datatoc_gpu_shader_gpencil_stroke_geom_glsl[];
 +
 +extern char datatoc_gpu_shader_gpencil_fill_vert_glsl[];
 +extern char datatoc_gpu_shader_gpencil_fill_frag_glsl[];
 +
  /* cache of built-in shaders (each is created on first use) */
  static GPUShader *builtin_shaders[GPU_NUM_BUILTIN_SHADERS] = { NULL };