[Bf-blender-cvs] [f30e4cd2362] soc-2019-npr: Merge branch 'master' into soc-2019-npr

[YimingWu]

Commit: f30e4cd2362e9c581fb1725ac89aae1f5e173abe
Author: YimingWu
Date:   Sat Jun 22 16:20:07 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBf30e4cd2362e9c581fb1725ac89aae1f5e173abe

Merge branch 'master' into soc-2019-npr

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



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

diff --cc source/blender/draw/CMakeLists.txt
index 0c14d73494e,8631a9f556b..f50cb8be979
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -260,21 -249,7 +260,22 @@@ data_to_c_simple(engines/workbench/shad
  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_dpix_preview_geom.glsl SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_preview_frag.glsl SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_project_passthrough_vert.glsl SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_snake_image_peel_frag.glsl SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_vert.glsl SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_geom.glsl SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_frag.glsl SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_snake_edge_frag.glsl SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_snake_multichannel_frag.glsl SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_software_passthrough_vert.glsl SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_software_chain_geom.glsl SRC)
 +
 +
+ data_to_c_simple(modes/shaders/common_colormanagement_lib.glsl 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)