[Bf-blender-cvs] [67ac0da53c1] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Nick Wu]

Commit: 67ac0da53c19e44a43dd82e82998d76ee7f9fe73
Author: Nick Wu
Date:   Tue Jul 17 15:34:14 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB67ac0da53c19e44a43dd82e82998d76ee7f9fe73

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

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



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

diff --cc source/blender/draw/CMakeLists.txt
index cad70cf1a28,e4c6a372d34..44373b3768a
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -233,21 -226,10 +234,23 @@@ data_to_c_simple(engines/workbench/shad
  data_to_c_simple(engines/workbench/shaders/workbench_shadow_geom.glsl SRC)
  data_to_c_simple(engines/workbench/shaders/workbench_shadow_caps_geom.glsl SRC)
  data_to_c_simple(engines/workbench/shaders/workbench_shadow_debug_frag.glsl SRC)
+ data_to_c_simple(engines/workbench/shaders/workbench_volume_vert.glsl SRC)
+ data_to_c_simple(engines/workbench/shaders/workbench_volume_frag.glsl SRC)
  data_to_c_simple(engines/workbench/shaders/workbench_world_light_lib.glsl SRC)
  
 +data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_preview.geometry SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_preview.fragment SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_project_clip.fragment SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_project_passthrough.vertex SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_image_peel.fragment SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_line_connection.vertex SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_line_connection.geometry SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_line_connection.fragment SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_snake_edge.fragment SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_snake_multichannel.fragment SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_software_line_width.geometry SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_software_scale_compensate.vertex SRC)
 +
  data_to_c_simple(modes/shaders/common_globals_lib.glsl SRC)
  data_to_c_simple(modes/shaders/common_hair_lib.glsl SRC)
  data_to_c_simple(modes/shaders/common_hair_refine_vert.glsl SRC)