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

[Antonio Vazquez]

Commit: f6b2b2cf380213806808ba49aa0c5d8e041295b3
Author: Antonio Vazquez
Date:   Tue May 2 22:25:23 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf6b2b2cf380213806808ba49aa0c5d8e041295b3

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/CMakeLists.txt
index 9a4c9dfdaa3,e04863d6ceb..f727df15cc0
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -82,9 -82,7 +82,10 @@@ set(SR
  	engines/eevee/eevee_engine.c
  	engines/eevee/eevee_lights.c
  	engines/eevee/eevee_probes.c
+ 	engines/external/external_engine.c
 +	engines/gpencil/gpencil_engine.h
 +	engines/gpencil/gpencil_engine.c
 +	engines/gpencil/gpencil_draw.c
  
  	DRW_engine.h
  	intern/DRW_render.h