[Bf-blender-cvs] [44e1c5d817b] temp-eeveelightcache: Merge remote-tracking branch 'origin/blender2.8' into temp-eeveelightcache

[Clément Foucault]

Commit: 44e1c5d817bfcfe6f917ce693e281aa24de3254b
Author: Clément Foucault
Date:   Thu Jun 14 11:30:27 2018 +0200
Branches: temp-eeveelightcache
https://developer.blender.org/rB44e1c5d817bfcfe6f917ce693e281aa24de3254b

Merge remote-tracking branch 'origin/blender2.8' into temp-eeveelightcache

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



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

diff --cc source/blender/draw/CMakeLists.txt
index b240614a12c,afb527a07c6..070825c7785
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -135,9 -133,7 +134,8 @@@ set(SR
  	modes/draw_mode_engines.h
  	modes/edit_mesh_mode_intern.h
  	engines/basic/basic_engine.h
- 	engines/clay/clay_engine.h
  	engines/eevee/eevee_engine.h
 +	engines/eevee/eevee_lightcache.h
  	engines/eevee/eevee_lut.h
  	engines/eevee/eevee_private.h
  	engines/external/external_engine.h