[Bf-blender-cvs] [bfbf0bb7f7a] lanpr-under-gp: Merge remote-tracking branch 'origin/master' into temp-lanpr-review

[YimingWu]

Commit: bfbf0bb7f7a0191b65fc724d5dfea225e6293c6b
Author: YimingWu
Date:   Thu Jun 4 18:57:28 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBbfbf0bb7f7a0191b65fc724d5dfea225e6293c6b

Merge remote-tracking branch 'origin/master' into temp-lanpr-review

# Conflicts:
#	release/datafiles/locale
#	release/scripts/addons

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



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

diff --cc source/blender/draw/CMakeLists.txt
index d9f7a3acae0,a26c150cb51..aeecb452217
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -317,19 -304,9 +318,19 @@@ data_to_c_simple(engines/select/shaders
  data_to_c_simple(engines/select/shaders/selection_id_frag.glsl SRC)
  
  data_to_c_simple(engines/basic/shaders/conservative_depth_geom.glsl SRC)
- data_to_c_simple(engines/basic/shaders/conservative_depth_vert.glsl SRC)
- data_to_c_simple(engines/basic/shaders/conservative_depth_frag.glsl SRC)
+ data_to_c_simple(engines/basic/shaders/depth_vert.glsl SRC)
+ data_to_c_simple(engines/basic/shaders/depth_frag.glsl SRC)
  
 +if(WITH_LANPR)
 +  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_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)
 +endif()
 +
  data_to_c_simple(engines/overlay/shaders/antialiasing_frag.glsl SRC)
  data_to_c_simple(engines/overlay/shaders/antialiasing_vert.glsl SRC)
  data_to_c_simple(engines/overlay/shaders/armature_dof_vert.glsl SRC)