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

[Antonio Vazquez]

Commit: af421a45e617f0156433a442ab3a893bd4c073c6
Author: Antonio Vazquez
Date:   Wed Nov 1 09:33:31 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBaf421a45e617f0156433a442ab3a893bd4c073c6

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/CMakeLists.txt
index 64d474c61e1,1fd731c0c41..f19796129ac
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -82,18 -82,20 +82,25 @@@ set(SR
  	modes/sculpt_mode.c
  	engines/basic/basic_engine.c
  	engines/clay/clay_engine.c
+ 	engines/eevee/eevee_bloom.c
  	engines/eevee/eevee_data.c
+ 	engines/eevee/eevee_depth_of_field.c
+ 	engines/eevee/eevee_effects.c
  	engines/eevee/eevee_engine.c
- 	engines/eevee/eevee_lights.c
  	engines/eevee/eevee_lightprobes.c
+ 	engines/eevee/eevee_lights.c
  	engines/eevee/eevee_materials.c
- 	engines/eevee/eevee_effects.c
+ 	engines/eevee/eevee_motion_blur.c
+ 	engines/eevee/eevee_occlusion.c
+ 	engines/eevee/eevee_screen_raytrace.c
+ 	engines/eevee/eevee_temporal_sampling.c
+ 	engines/eevee/eevee_volumes.c
  	engines/external/external_engine.c
 +	engines/gpencil/gpencil_engine.h
 +	engines/gpencil/gpencil_engine.c
 +	engines/gpencil/gpencil_draw_cache_impl.c
 +	engines/gpencil/gpencil_geom.c
 +	engines/gpencil/gpencil_vfx.c
  
  	DRW_engine.h
  	intern/DRW_render.h