[Bf-blender-cvs] [336abd6face] blender2.8-workbench: Merge branch 'blender2.8' into blender2.8-workbench

[Jeroen Bakker]

Commit: 336abd6face423bf75e58ac1d67662a9eeb2e34c
Author: Jeroen Bakker
Date:   Wed Apr 25 12:20:45 2018 +0200
Branches: blender2.8-workbench
https://developer.blender.org/rB336abd6face423bf75e58ac1d67662a9eeb2e34c

Merge branch 'blender2.8' into blender2.8-workbench

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



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

diff --cc source/blender/draw/modes/overlay_mode.c
index 69dac8699b2,7efd63d8e0a..07f6a6b253f
--- a/source/blender/draw/modes/overlay_mode.c
+++ b/source/blender/draw/modes/overlay_mode.c
@@@ -130,7 -82,7 +82,6 @@@ static void overlay_engine_init(void *v
  
  static void overlay_cache_init(void *vedata)
  {
--
  	OVERLAY_Data * data = (OVERLAY_Data *)vedata;
  	OVERLAY_PassList *psl = data->psl;
  	OVERLAY_StorageList *stl = data->stl;