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

[YimingWu]

Commit: 242ddba1180a5d06cb7d1da5cf77c60a06fdb6b2
Author: YimingWu
Date:   Thu Aug 15 08:56:40 2019 +0800
Branches: temp-lanpr-staging
https://developer.blender.org/rB242ddba1180a5d06cb7d1da5cf77c60a06fdb6b2

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

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



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

diff --cc source/blender/draw/CMakeLists.txt
index 0ac2bec1f16,1112a7a87db..46a46bc55b6
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -128,13 -129,8 +129,14 @@@ 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_engine.c
  
    DRW_engine.h
    DRW_select_buffer.h