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

[YimingWu]

Commit: afac2afbfcdb06a2d2655e63d0b8bc35b1aba18e
Author: YimingWu
Date:   Fri Aug 16 14:27:04 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBafac2afbfcdb06a2d2655e63d0b8bc35b1aba18e

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

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



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

diff --cc source/blender/draw/CMakeLists.txt
index 8bb309d72d9,1112a7a87db..fc91ac371cb
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -127,14 -129,8 +129,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
+   engines/select/select_engine.c
  
    DRW_engine.h
    DRW_select_buffer.h