[Bf-blender-cvs] [d2c404f0500] soc-2019-npr: Merge remote-tracking branch 'origin/master' into soc-2019-npr

[YimingWu]

Commit: d2c404f0500ff727fb6ef9869f80880ba3a2b4ba
Author: YimingWu
Date:   Thu Aug 8 16:57:09 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBd2c404f0500ff727fb6ef9869f80880ba3a2b4ba

Merge remote-tracking branch 'origin/master' into soc-2019-npr

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



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

diff --cc source/blender/draw/CMakeLists.txt
index d64e9226008,27328084f31..5440797454a
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -127,15 -127,12 +127,17 @@@ 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
    intern/DRW_render.h
    intern/draw_cache.h
    intern/draw_cache_impl.h