[Bf-blender-cvs] [00907964d93] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 00907964d93a0cd4d6e550376e9f020fbd805b1c
Author: Antonio Vazquez
Date:   Tue May 22 16:42:22 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB00907964d93a0cd4d6e550376e9f020fbd805b1c

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/CMakeLists.txt
index 41ad66ff81e,71bdcc7496c..008dfdb0e25
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -109,13 -112,8 +112,14 @@@ set(SR
  	engines/workbench/workbench_materials.c
  	engines/workbench/workbench_studiolight.c
  	engines/workbench/solid_mode.c
+ 	engines/workbench/transparent_mode.c
  	engines/external/external_engine.c
 +	engines/gpencil/gpencil_engine.h
 +	engines/gpencil/gpencil_engine.c
 +	engines/gpencil/gpencil_render.c
 +	engines/gpencil/gpencil_cache_utils.c
 +	engines/gpencil/gpencil_draw_utils.c
 +	engines/gpencil/gpencil_draw_cache_impl.c
  
  	DRW_engine.h
  	intern/DRW_render.h