[Bf-blender-cvs] [ccc113deba8] temp-lanpr-staging: Merge remote-tracking branch 'origin/master' into temp-lanpr-staging

[YimingWu]

Commit: ccc113deba817e17ad63ecd2169a4ae1cb05e17a
Author: YimingWu
Date:   Wed Aug 14 15:46:31 2019 +0800
Branches: temp-lanpr-staging
https://developer.blender.org/rBccc113deba817e17ad63ecd2169a4ae1cb05e17a

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

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



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

diff --cc source/blender/draw/CMakeLists.txt
index 8bb309d72d9,84302e3cf44..0ac2bec1f16
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -127,14 -128,8 +128,13 @@@ set(SR
    engines/gpencil/gpencil_engine.h
    engines/gpencil/gpencil_render.c
    engines/gpencil/gpencil_shader_fx.c
 +	engines/lanpr/lanpr_dpix.c
 +	engines/lanpr/lanpr_engine.c
 +	# engines/lanpr/lanpr_snake.c  deprecated for now.
 +	engines/lanpr/lanpr_cpu.c
 +  engines/lanpr/lanpr_chain_draw.c
    engines/select/select_engine.c
    engines/select/select_draw_utils.c
-   engines/select/select_buffer.c
  
    DRW_engine.h
    DRW_select_buffer.h