Commit: d515b4e205f054170086be602f8aaee3e6d5e968 Author: YimingWu Date: Fri Aug 16 09:42:46 2019 +0800 Branches: temp-lanpr-staging https://developer.blender.org/rBd515b4e205f054170086be602f8aaee3e6d5e968
Merge remote-tracking branch 'origin/master' into temp-lanpr-staging =================================================================== =================================================================== diff --cc source/blender/draw/CMakeLists.txt index 0ac2bec1f16,1112a7a87db..fc91ac371cb --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@@ -128,13 -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_engine.c DRW_engine.h DRW_select_buffer.h _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs